diff options
| author | Emīls <emils@mullvad.net> | 2024-07-17 18:01:56 +0200 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2024-07-17 18:01:56 +0200 |
| commit | 2368bb8748f80bb8c120cda7a141c4a9e52cb6ec (patch) | |
| tree | 1fa04120949cfc30d5ab4f795b6a2dc8461b0a80 /ios | |
| parent | 0ba177b8f2a501e64b8401de13b38efe7880e865 (diff) | |
| parent | 7c36c7f12f2dc7541a2f9aa0d49f734ab5ef37fe (diff) | |
| download | mullvadvpn-2368bb8748f80bb8c120cda7a141c4a9e52cb6ec.tar.xz mullvadvpn-2368bb8748f80bb8c120cda7a141c4a9e52cb6ec.zip | |
Merge branch 'update-wireguard-apple'
Diffstat (limited to 'ios')
4 files changed, 6 insertions, 2 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 2e683686da..e4b9a2a532 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -9111,7 +9111,7 @@ repositoryURL = "https://github.com/mullvad/wireguard-apple.git"; requirement = { kind = revision; - revision = 15242e1698fc45261285d7417ed2cd5130d7332e; + revision = 5f24cdf1aa7fc1802f1695473aab95b4451e4ba0; }; }; /* 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 929180afa4..e169091f3c 100644 --- a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,7 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mullvad/wireguard-apple.git", "state" : { - "revision" : "15242e1698fc45261285d7417ed2cd5130d7332e" + "revision" : "5f24cdf1aa7fc1802f1695473aab95b4451e4ba0" } } ], diff --git a/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift b/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift index 6a88af373d..69806809d4 100644 --- a/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift +++ b/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift @@ -35,6 +35,8 @@ extension WireGuardAdapterError: LocalizedError { case let .startWireGuardBackend(code): return "Failure to start WireGuard backend (error code: \(code))." + case .noInterfaceIp: + return "Interface has no IP address specified." } } } diff --git a/ios/build-wireguard-go.sh b/ios/build-wireguard-go.sh index 60b3b00784..7952b4dc2c 100755 --- a/ios/build-wireguard-go.sh +++ b/ios/build-wireguard-go.sh @@ -37,6 +37,8 @@ fi WIREGUARD_KIT_GO_PATH="$RESOLVED_SOURCE_PACKAGES_PATH/checkouts/wireguard-apple/Sources/WireGuardKitGo" echo "WireGuardKitGo path resolved to $WIREGUARD_KIT_GO_PATH" +export PATH=/opt/homebrew/opt/go@1.20/bin:$PATH + # Run make # shellcheck disable=SC2086 /usr/bin/make -C "$WIREGUARD_KIT_GO_PATH" $ACTION |