From 9ab7e786dab3dd039df1e96e9f2a80ebffab617b Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Mon, 11 Sep 2023 15:40:42 +0200 Subject: [PATCH 1/4] Updates BSK version and fixes a tester issue in iOS --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- DuckDuckGo/NetworkProtectionTunnelController.swift | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 3715d07b19..c18e2ef401 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -8877,8 +8877,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 77.2.0; + kind = revision; + revision = 98d52799ee42805ac3c74184f100a678dd5e52b7; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a130d9919d..8169a05571 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { "branch": null, - "revision": "42b073f8a26165e8b328a5f72501abfecdd4c666", - "version": "77.2.0" + "revision": "98d52799ee42805ac3c74184f100a678dd5e52b7", + "version": null } }, { diff --git a/DuckDuckGo/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtectionTunnelController.swift index 2c7f98404d..67f9997d03 100644 --- a/DuckDuckGo/NetworkProtectionTunnelController.swift +++ b/DuckDuckGo/NetworkProtectionTunnelController.swift @@ -101,10 +101,10 @@ final class NetworkProtectionTunnelController: TunnelController { // Temporary investigation to see if connection tester is causing energy use issues // To be removed with https://app.asana.com/0/0/1205418028628990/f - options[NetworkProtectionOptionKey.connectionTesterEnabled] = "false" as NSString + options[NetworkProtectionOptionKey.connectionTesterEnabled] = NSNumber(value: false) if let optionKey = Self.enabledSimulationOption?.optionKey { - options[optionKey] = NetworkProtectionOptionValue.true + options[optionKey] = NSNumber(value: true) Self.enabledSimulationOption = nil } From d72dab2a06829dc71f01f3c67b8c2f256b747dda Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Mon, 11 Sep 2023 16:34:30 +0200 Subject: [PATCH 2/4] Updates BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index c18e2ef401..358c2d2081 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -8878,7 +8878,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = revision; - revision = 98d52799ee42805ac3c74184f100a678dd5e52b7; + revision = c687e3decad2f01dd04b0b0ed92fcb7050155995; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8169a05571..371ac29293 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,7 +15,7 @@ "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { "branch": null, - "revision": "98d52799ee42805ac3c74184f100a678dd5e52b7", + "revision": "c687e3decad2f01dd04b0b0ed92fcb7050155995", "version": null } }, From 7c5c44e77b6b9454df9e6c5f151138867e3a188a Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Tue, 12 Sep 2023 18:57:23 +0200 Subject: [PATCH 3/4] Updates to BSK 77.3.1 --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 358c2d2081..189138e4d7 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -8877,8 +8877,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = revision; - revision = c687e3decad2f01dd04b0b0ed92fcb7050155995; + kind = exactVersion; + version = 77.3.1; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { From d862efb521de2fd0f60391245f59173c4c04a9a3 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Tue, 12 Sep 2023 18:57:37 +0200 Subject: [PATCH 4/4] Updates Package.resolved --- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 371ac29293..5545349a2c 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { "branch": null, - "revision": "c687e3decad2f01dd04b0b0ed92fcb7050155995", - "version": null + "revision": "6246a822793012c22e5c032db92662e88b268c14", + "version": "77.3.1" } }, { @@ -156,7 +156,7 @@ }, { "package": "TrackerRadarKit", - "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit", + "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit.git", "state": { "branch": null, "revision": "4684440d03304e7638a2c8086895367e90987463",