diff options
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 22 | ||||
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 6 | ||||
| -rw-r--r-- | ios/MullvadVPN/IPAddressRange+Codable.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/PrivateKeyWithMetadata.swift | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/REST/RESTClient.swift | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/TunnelManager/SetAccountOperation.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/TunnelManager/TunnelManager.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/TunnelSettings.swift | 4 |
8 files changed, 23 insertions, 23 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index a7c5dc561c..1b6b6d4243 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 5806768127048EE000C858CB /* KeychainMatchLimit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FAEDFC24533A5500CB0F5B /* KeychainMatchLimit.swift */; }; 5806768227048F6800C858CB /* AnyOptional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58E1337026D2BE9C00CC316B /* AnyOptional.swift */; }; 5806768327048F7A00C858CB /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585DA8AE26B9492500B8C587 /* Promise.swift */; }; + 5807483B27DB8A980020ECBF /* WireGuardKitTypes in Frameworks */ = {isa = PBXBuildFile; productRef = 5807483A27DB8A980020ECBF /* WireGuardKitTypes */; }; 5807E2C02432038B00F5FF30 /* String+Split.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5807E2BF2432038B00F5FF30 /* String+Split.swift */; }; 5807E2C2243203D000F5FF30 /* StringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5807E2C1243203D000F5FF30 /* StringTests.swift */; }; 5807E2C3243203E700F5FF30 /* String+Split.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5807E2BF2432038B00F5FF30 /* String+Split.swift */; }; @@ -246,7 +247,6 @@ 58BA692E23E99EFF009DC256 /* Locking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BA692D23E99EFF009DC256 /* Locking.swift */; }; 58BA693123EADA6A009DC256 /* SimulatorTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BA693023EADA6A009DC256 /* SimulatorTunnelProvider.swift */; }; 58BA791B2578F092006FAEA0 /* WireGuardKit in Frameworks */ = {isa = PBXBuildFile; productRef = 58BA791A2578F092006FAEA0 /* WireGuardKit */; }; - 58BA7947257901A5006FAEA0 /* WireGuardKit in Frameworks */ = {isa = PBXBuildFile; productRef = 58BA7946257901A5006FAEA0 /* WireGuardKit */; }; 58BFA5C622A7C97F00A6173D /* RelayCacheTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BFA5C522A7C97F00A6173D /* RelayCacheTracker.swift */; }; 58BFA5CC22A7CE1F00A6173D /* ApplicationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BFA5CB22A7CE1F00A6173D /* ApplicationConfiguration.swift */; }; 58BFA5CD22A7CE1F00A6173D /* ApplicationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BFA5CB22A7CE1F00A6173D /* ApplicationConfiguration.swift */; }; @@ -624,8 +624,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 5807483B27DB8A980020ECBF /* WireGuardKitTypes in Frameworks */, 585834F824D2BC1F00A8AF56 /* Logging in Frameworks */, - 58BA7947257901A5006FAEA0 /* WireGuardKit in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1115,7 +1115,7 @@ name = MullvadVPN; packageProductDependencies = ( 585834F724D2BC1F00A8AF56 /* Logging */, - 58BA7946257901A5006FAEA0 /* WireGuardKit */, + 5807483A27DB8A980020ECBF /* WireGuardKitTypes */, ); productName = MullvadVPN; productReference = 58CE5E60224146200008646E /* MullvadVPN.app */; @@ -2193,15 +2193,20 @@ }; 58BA79192578F092006FAEA0 /* XCRemoteSwiftPackageReference "wireguard-apple" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://git.zx2c4.com/wireguard-apple"; + repositoryURL = "https://github.com/mullvad/wireguard-apple.git"; requirement = { - kind = revision; - revision = 7dea71898d7d11495c7bb9a0b4f8215ae2efe53f; + branch = "mullvad-master"; + kind = branch; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 5807483A27DB8A980020ECBF /* WireGuardKitTypes */ = { + isa = XCSwiftPackageProductDependency; + package = 58BA79192578F092006FAEA0 /* XCRemoteSwiftPackageReference "wireguard-apple" */; + productName = WireGuardKitTypes; + }; 584789EB2652A1A2000E45FB /* Logging */ = { isa = XCSwiftPackageProductDependency; package = 585834F624D2BC1F00A8AF56 /* XCRemoteSwiftPackageReference "swift-log" */; @@ -2227,11 +2232,6 @@ package = 58BA79192578F092006FAEA0 /* XCRemoteSwiftPackageReference "wireguard-apple" */; productName = WireGuardKit; }; - 58BA7946257901A5006FAEA0 /* WireGuardKit */ = { - isa = XCSwiftPackageProductDependency; - package = 58BA79192578F092006FAEA0 /* XCRemoteSwiftPackageReference "wireguard-apple" */; - productName = WireGuardKit; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 58CE5E58224146200008646E /* Project object */; diff --git a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7e56489a3f..5493113eef 100644 --- a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -12,10 +12,10 @@ }, { "package": "WireGuardKit", - "repositoryURL": "https://git.zx2c4.com/wireguard-apple", + "repositoryURL": "https://github.com/mullvad/wireguard-apple.git", "state": { - "branch": null, - "revision": "7dea71898d7d11495c7bb9a0b4f8215ae2efe53f", + "branch": "mullvad-master", + "revision": "736a4bb5baba4e2c70686f59416d50c3b06e8424", "version": null } } diff --git a/ios/MullvadVPN/IPAddressRange+Codable.swift b/ios/MullvadVPN/IPAddressRange+Codable.swift index 79f9e00a65..57df3d1ac2 100644 --- a/ios/MullvadVPN/IPAddressRange+Codable.swift +++ b/ios/MullvadVPN/IPAddressRange+Codable.swift @@ -7,7 +7,7 @@ // import Foundation -import struct WireGuardKit.IPAddressRange +import struct WireGuardKitTypes.IPAddressRange extension IPAddressRange: Codable { public func encode(to encoder: Encoder) throws { diff --git a/ios/MullvadVPN/PrivateKeyWithMetadata.swift b/ios/MullvadVPN/PrivateKeyWithMetadata.swift index fb39027817..04e73f784c 100644 --- a/ios/MullvadVPN/PrivateKeyWithMetadata.swift +++ b/ios/MullvadVPN/PrivateKeyWithMetadata.swift @@ -7,8 +7,8 @@ // import Foundation -import class WireGuardKit.PrivateKey -import class WireGuardKit.PublicKey +import class WireGuardKitTypes.PrivateKey +import class WireGuardKitTypes.PublicKey /// A struct holding a private WireGuard key with associated metadata struct PrivateKeyWithMetadata: Equatable { diff --git a/ios/MullvadVPN/REST/RESTClient.swift b/ios/MullvadVPN/REST/RESTClient.swift index b58822d4cd..1f60e8b598 100644 --- a/ios/MullvadVPN/REST/RESTClient.swift +++ b/ios/MullvadVPN/REST/RESTClient.swift @@ -8,8 +8,8 @@ import Foundation import Network -import class WireGuardKit.PublicKey -import struct WireGuardKit.IPAddressRange +import class WireGuardKitTypes.PublicKey +import struct WireGuardKitTypes.IPAddressRange extension REST { diff --git a/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift b/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift index f20986d118..f09ee90f68 100644 --- a/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift +++ b/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift @@ -7,7 +7,7 @@ // import Foundation -import class WireGuardKit.PublicKey +import class WireGuardKitTypes.PublicKey import Logging class SetAccountOperation: AsyncOperation { diff --git a/ios/MullvadVPN/TunnelManager/TunnelManager.swift b/ios/MullvadVPN/TunnelManager/TunnelManager.swift index 9fa6de52d7..96cf744505 100644 --- a/ios/MullvadVPN/TunnelManager/TunnelManager.swift +++ b/ios/MullvadVPN/TunnelManager/TunnelManager.swift @@ -11,7 +11,7 @@ import Foundation import NetworkExtension import UIKit import Logging -import class WireGuardKit.PublicKey +import class WireGuardKitTypes.PublicKey /// A class that provides a convenient interface for VPN tunnels configuration, manipulation and /// monitoring. diff --git a/ios/MullvadVPN/TunnelSettings.swift b/ios/MullvadVPN/TunnelSettings.swift index aa0554d3c2..a9d8c5b063 100644 --- a/ios/MullvadVPN/TunnelSettings.swift +++ b/ios/MullvadVPN/TunnelSettings.swift @@ -8,8 +8,8 @@ import Foundation import struct Network.IPv4Address -import class WireGuardKit.PublicKey -import struct WireGuardKit.IPAddressRange +import class WireGuardKitTypes.PublicKey +import struct WireGuardKitTypes.IPAddressRange /// A struct that holds a tun interface configuration. struct InterfaceSettings: Codable, Equatable { |