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.

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

merged 5 commits into from
Jan 16, 2024

Conversation

SlayterDev
Copy link
Contributor

@SlayterDev SlayterDev commented Dec 21, 2023

@SlayterDev SlayterDev self-assigned this Dec 21, 2023
@SlayterDev SlayterDev marked this pull request as ready for review December 21, 2023 20:41
Comment on lines 6 to 36
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 😄

Copy link
Collaborator

@samsymons samsymons left a comment

Choose a reason for hiding this comment

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

LGTM pending the comment I posted being resolved.

@SlayterDev SlayterDev merged commit faecf1d into main Jan 16, 2024
14 checks passed
@SlayterDev SlayterDev deleted the brad/better-amp-checks branch January 16, 2024 14:59
samsymons added a commit that referenced this pull request Jan 17, 2024
# By Dominik Kapusta (16) and others
# Via Dominik Kapusta (2) and others
* main: (67 commits)
  Increase polling interval for captcha solver (#2071)
  Add a link to help page in location permission popup (#2017)
  Add bookmark popover in SwiftUI (#2036)
  Better detection of AMP pages (#2001)
  UI adjustments for improved VPN user control (#2043)
  Don't override drop operation if source view is webView (#2058)
  Bump version to 1.71.0 (104)
  Set marketing version to 1.71.0
  Update embedded files
  VPN Geoswitching - look and feel tweaks + Pixels (#2045)
  fix Bookmarks Manager empty state constraint (#2034)
  Add Folder modal in SwiftUI (#2033)
  Fix serverlocation in connection notification (#2053)
  Use GRDB.swift 2.23.0 (upstream 6.32.0, SQLCipher 4.5.5) (#2021)
  Bump version to 1.70.0 (103)
  Update embedded files
  macOS: Fix issue with not being able to add favorites for existing bookmarks in the latest 1.70.0 internal (#2059)
  Bump version to 1.70.0 (102)
  Update embedded files
  Remove observer from DataBrokerProtectionViewController (#2057)
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	LocalPackages/BuildToolPlugins/Plugins/InputFilesChecker/InputFilesChecker.swift
samsymons added a commit that referenced this pull request Jan 18, 2024
* main:
  Bump BrowserServicesKit Version (#2063)
  Bump autoconsent to 9.1.0 (#2067)
  Fix casing in some copy items in Preferences and Main Menu (#2070)
  Fix vertical alignment of privacy feed shield icon (#2069)
  Fix giving focus to webView when it's loaded in BrowserTabViewController (#2073)
  Increase polling interval for captcha solver (#2071)
  Add a link to help page in location permission popup (#2017)
  Add bookmark popover in SwiftUI (#2036)
  Better detection of AMP pages (#2001)
  UI adjustments for improved VPN user control (#2043)
  Don't override drop operation if source view is webView (#2058)
  Bump version to 1.71.0 (104)
  Set marketing version to 1.71.0
  Update embedded files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants