From 4934cb73d7c13165a0c6e8cc9b43fdc2b1f2ee3b Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Wed, 13 Mar 2024 00:11:18 +0100 Subject: [PATCH 1/2] Fix VPN rekeying (#2369) Task/Issue URL: https://app.asana.com/0/1199230911884351/1206800069675113/f iOS: https://github.com/duckduckgo/iOS/pull/2577 BSK: https://github.com/duckduckgo/BrowserServicesKit/pull/716 ## Description Fixes the following: - Several users seem to be no longer rekeying in the latest releases. - Some users seem to have trouble connecting due to these rekeying issues. --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- .../NetworkExtensionTargets/MacPacketTunnelProvider.swift | 4 ++-- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- LocalPackages/SubscriptionUI/Package.swift | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index e005658d55..373021ff66 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -13770,7 +13770,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 121.0.0; + version = "121.0.0-1"; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8749a59390..3f56380165 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "4555c3dbf265f1dca0304c69e7013b9d46a758b3", - "version" : "121.0.0" + "revision" : "592242549bc2258d5ebeb3224029267915bcca52", + "version" : "121.0.0-1" } }, { diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift index 3074e6d389..8b35cbd540 100644 --- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift +++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift @@ -203,12 +203,12 @@ final class MacPacketTunnelProvider: PacketTunnelProvider { switch step { case .begin: PixelKit.fire( - NetworkProtectionPixelEvent.networkProtectionRekeyCompleted, + NetworkProtectionPixelEvent.networkProtectionRekeyAttempt, frequency: .dailyAndContinuous, includeAppVersionParameter: true) case .failure(let error): PixelKit.fire( - NetworkProtectionPixelEvent.networkProtectionRekeyCompleted, + NetworkProtectionPixelEvent.networkProtectionRekeyFailure, frequency: .dailyAndContinuous, withError: error, includeAppVersionParameter: true) diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 87c5b62cc9..e773b78b41 100644 --- a/LocalPackages/DataBrokerProtection/Package.swift +++ b/LocalPackages/DataBrokerProtection/Package.swift @@ -29,7 +29,7 @@ let package = Package( targets: ["DataBrokerProtection"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0-1"), .package(path: "../PixelKit"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper"), diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index 36497d486c..8d5e069afb 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -31,7 +31,7 @@ let package = Package( .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0-1"), .package(path: "../XPCHelper"), .package(path: "../SwiftUIExtensions"), .package(path: "../LoginItems"), diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift index a450104d34..91bad2741b 100644 --- a/LocalPackages/SubscriptionUI/Package.swift +++ b/LocalPackages/SubscriptionUI/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["SubscriptionUI"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0-1"), .package(path: "../SwiftUIExtensions") ], targets: [ From 187b170708ac16aaa4ed8fc2edb0d15825042fc7 Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Wed, 13 Mar 2024 07:16:29 +0000 Subject: [PATCH 2/2] Bump version to 1.79.0 (139) --- Configuration/BuildNumber.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig index 22be7a1dbd..eada566b14 100644 --- a/Configuration/BuildNumber.xcconfig +++ b/Configuration/BuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 138 +CURRENT_PROJECT_VERSION = 139