summaryrefslogtreecommitdiffhomepage
path: root/ios
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2021-06-21 11:10:04 +0200
committerAndrej Mihajlov <and@mullvad.net>2021-06-21 11:10:04 +0200
commit896348f904360217896b92a8db406220484a993a (patch)
tree57324511c45e3a8e8c1eef773c583333fbef3dc7 /ios
parent1c7f284c710f3b96f8849d9ad7de989c8f8a5fe0 (diff)
parent0d3d6650a9d57a85dd441663a4f504729ef8d52c (diff)
downloadmullvadvpn-896348f904360217896b92a8db406220484a993a.tar.xz
mullvadvpn-896348f904360217896b92a8db406220484a993a.zip
Merge branch 'update-wireguard-go'
Diffstat (limited to 'ios')
-rw-r--r--ios/MullvadVPN.xcodeproj/project.pbxproj4
-rw-r--r--ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved6
-rw-r--r--ios/PacketTunnel/PacketTunnelProvider.swift4
3 files changed, 6 insertions, 8 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
index 749e844fc3..781919a32d 100644
--- a/ios/MullvadVPN.xcodeproj/project.pbxproj
+++ b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -1638,8 +1638,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://git.zx2c4.com/wireguard-apple";
requirement = {
- kind = exactVersion;
- version = "1.0.12-22";
+ kind = revision;
+ revision = c1f509d65bba1c00c6b6ef93826f658ff36a0761;
};
};
/* End XCRemoteSwiftPackageReference section */
diff --git a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 58780c69e1..8008fae640 100644
--- a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -11,12 +11,12 @@
}
},
{
- "package": "WireGuardKit",
+ "package": "wireguard-apple",
"repositoryURL": "https://git.zx2c4.com/wireguard-apple",
"state": {
"branch": null,
- "revision": "c4f79beb8d23078393451d1173f3b9342c6ea66e",
- "version": "1.0.12-22"
+ "revision": "c1f509d65bba1c00c6b6ef93826f658ff36a0761",
+ "version": null
}
}
]
diff --git a/ios/PacketTunnel/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider.swift
index 8f3d83426a..bee420458f 100644
--- a/ios/PacketTunnel/PacketTunnelProvider.swift
+++ b/ios/PacketTunnel/PacketTunnelProvider.swift
@@ -551,10 +551,8 @@ extension PacketTunnelState: CustomStringConvertible, CustomDebugStringConvertib
extension WireGuardLogLevel {
var loggerLevel: Logger.Level {
switch self {
- case .debug:
+ case .verbose:
return .debug
- case .info:
- return .info
case .error:
return .error
}