Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better detection of AMP pages #2001

Merged
merged 5 commits into from
Jan 16, 2024
Merged

Better detection of AMP pages #2001

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25d029a
Update BSK
SlayterDev Dec 21, 2023
2faf464
Merge branch 'main' into brad/better-amp-checks
SlayterDev Jan 8, 2024
40e08be
Update BSK
SlayterDev Jan 12, 2024
1effd80
Merge branch 'main' into brad/better-amp-checks
SlayterDev Jan 16, 2024
c8e9c83
Remove dead package dir
SlayterDev Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13065,8 +13065,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 100.0.3;
kind = revision;
revision = 7522aa923521c26b6503db8754829e33c450bc68;
};
};
AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
Expand Down
3 changes: 1 addition & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "f2b6a76e4ed0ce3147cdf0cba94cf0d1b928d687",
"version" : "100.0.3"
"revision" : "7522aa923521c26b6503db8754829e33c450bc68"
}
},
{
Expand Down
36 changes: 36 additions & 0 deletions LocalPackages/Account/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// swift-tools-version: 5.8
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "Account",
platforms: [ .macOS("11.4") ],
products: [
.library(
name: "Account",
targets: ["Account"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "6049341ed442d65cfd1bc3ed4d76790a3dcd8a0a"),
.package(path: "../Purchase")
],
targets: [
.target(
name: "Account",
dependencies: [
.product(name: "BrowserServicesKit", package: "BrowserServicesKit"),
.product(name: "Purchase", package: "Purchase")
],
swiftSettings: [
.define("DEBUG", .when(configuration: .debug))
],
plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")]
),
.testTarget(
name: "AccountTests",
dependencies: ["Account"],
plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")]
),
]
)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious to know what happened here - this is a Privacy Pro related package 😄

2 changes: 1 addition & 1 deletion LocalPackages/DataBrokerProtection/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let package = Package(
targets: ["DataBrokerProtection"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
.package(path: "../PixelKit"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../XPCHelper")
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/LoginItems/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/NetworkProtectionMac/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let package = Package(
.library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
.package(path: "../XPCHelper"),
.package(path: "../SwiftUIExtensions")
],
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/PixelKit/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/Subscription/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let package = Package(
targets: ["Subscription"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SwiftUIExtensions/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SyncUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ let package = Package(
],
dependencies: [
.package(path: "../SwiftUIExtensions"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SystemExtensionManager/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
],
targets: [
// Targets are the basic building blocks of a package, defining a module or a test suite.
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/XPCHelper/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let package = Package(
.library(name: "XPCHelper", targets: ["XPCHelper"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "100.0.3"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down