From dd145b68bcd90a76cc50f7e5b96819902febf927 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Wed, 18 Dec 2024 15:51:22 +0100 Subject: [PATCH 1/5] Update C-S-S to use a build from a branch --- Package.resolved | 8 ++++---- Package.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.resolved b/Package.resolved index 54664d324..d8f3f1241 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "bc808eb735d9eb72d5c54cf2452b104b6a370e25", - "version" : "6.43.0" + "branch" : "pr-releases/pr-1336", + "revision" : "e718af6217793aa0668168673cd7f07fe0025526" } }, { @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-concurrency-extras", "state" : { - "revision" : "163409ef7dae9d960b87f34b51587b6609a76c1f", - "version" : "1.3.0" + "revision" : "82a4ae7170d98d8538ec77238b7eb8e7199ef2e8", + "version" : "1.3.1" } }, { diff --git a/Package.swift b/Package.swift index 3b2e508e3..79b927ce9 100644 --- a/Package.swift +++ b/Package.swift @@ -55,7 +55,7 @@ let package = Package( .package(url: "https://github.com/duckduckgo/TrackerRadarKit", exact: "3.0.0"), .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.3.0"), .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "3.0.0"), - .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "6.43.0"), + .package(url: "https://github.com/duckduckgo/content-scope-scripts", branch: "pr-releases/pr-1336"), .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "7.5.0"), .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"), .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"), From 68201f76152e1d65bc03ec2aae142feffdc07e4b Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Tue, 7 Jan 2025 17:37:34 +0100 Subject: [PATCH 2/5] Update C-S-S to 7.1.0 --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index d8f3f1241..87830b39d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "branch" : "pr-releases/pr-1336", - "revision" : "e718af6217793aa0668168673cd7f07fe0025526" + "revision" : "a539758027d9fd37d9d26213399ac156ca9fb81c", + "version" : "7.1.0" } }, { diff --git a/Package.swift b/Package.swift index 79b927ce9..8611970a9 100644 --- a/Package.swift +++ b/Package.swift @@ -55,7 +55,7 @@ let package = Package( .package(url: "https://github.com/duckduckgo/TrackerRadarKit", exact: "3.0.0"), .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.3.0"), .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "3.0.0"), - .package(url: "https://github.com/duckduckgo/content-scope-scripts", branch: "pr-releases/pr-1336"), + .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "7.1.0"), .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "7.5.0"), .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"), .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"), From eb7577b77145bbd5bf7180e66a8c60250498e5b5 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Wed, 8 Jan 2025 15:45:39 +0100 Subject: [PATCH 3/5] Update C-S-S branch --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 87830b39d..d57029a2f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "a539758027d9fd37d9d26213399ac156ca9fb81c", - "version" : "7.1.0" + "branch" : "pr-releases/pr-1380", + "revision" : "6385a56dbaff76324c3629714ee752213aa51ce4" } }, { diff --git a/Package.swift b/Package.swift index 8611970a9..f95543cc9 100644 --- a/Package.swift +++ b/Package.swift @@ -55,7 +55,7 @@ let package = Package( .package(url: "https://github.com/duckduckgo/TrackerRadarKit", exact: "3.0.0"), .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.3.0"), .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "3.0.0"), - .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "7.1.0"), + .package(url: "https://github.com/duckduckgo/content-scope-scripts", branch: "pr-releases/pr-1380"), .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "7.5.0"), .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"), .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"), From 21ff9826030dac2f2bea79feeb76ac668b775edd Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Thu, 9 Jan 2025 11:29:23 +0100 Subject: [PATCH 4/5] Update C-S-S ref --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index d57029a2f..4a2ea2e94 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "branch" : "pr-releases/pr-1380", - "revision" : "6385a56dbaff76324c3629714ee752213aa51ce4" + "branch" : "pr-releases/pr-1382", + "revision" : "074da13d40166b5ef745d0cccbf613f5d5ae0275" } }, { diff --git a/Package.swift b/Package.swift index f95543cc9..5047bf2f7 100644 --- a/Package.swift +++ b/Package.swift @@ -55,7 +55,7 @@ let package = Package( .package(url: "https://github.com/duckduckgo/TrackerRadarKit", exact: "3.0.0"), .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.3.0"), .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "3.0.0"), - .package(url: "https://github.com/duckduckgo/content-scope-scripts", branch: "pr-releases/pr-1380"), + .package(url: "https://github.com/duckduckgo/content-scope-scripts", branch: "pr-releases/pr-1382"), .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "7.5.0"), .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"), .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"), From c65f8cff4f34806817e467bd1aa85f777ad1f064 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Thu, 9 Jan 2025 12:48:31 +0100 Subject: [PATCH 5/5] Use C-S-S 7.4.0 --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 4a2ea2e94..84e5cc93d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "branch" : "pr-releases/pr-1382", - "revision" : "074da13d40166b5ef745d0cccbf613f5d5ae0275" + "revision" : "06d244c4e0951ef16217c46f23c4865c5f98dd5c", + "version" : "7.4.0" } }, { diff --git a/Package.swift b/Package.swift index 5047bf2f7..2a6e0bca0 100644 --- a/Package.swift +++ b/Package.swift @@ -55,7 +55,7 @@ let package = Package( .package(url: "https://github.com/duckduckgo/TrackerRadarKit", exact: "3.0.0"), .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.3.0"), .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "3.0.0"), - .package(url: "https://github.com/duckduckgo/content-scope-scripts", branch: "pr-releases/pr-1382"), + .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "7.4.0"), .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "7.5.0"), .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"), .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"),