diff options
| author |   Andrej Mihajlov <and@mullvad.net> | 2020-12-02 13:40:56 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2020-12-03 13:22:52 +0100 |
| commit | 41e006a4079a41d2a8f5e99a7f1e492ec802c9ef (patch) | |
| tree | 6d45edbf1fafb90f9a12a2ac851b67ceff621c66 | |
| parent | WireGuardKit: Add TODO to log the error coming from `withReresolvedIP` (diff) | |
| download | wireguard-apple-41e006a4079a41d2a8f5e99a7f1e492ec802c9ef.tar.xz wireguard-apple-41e006a4079a41d2a8f5e99a7f1e492ec802c9ef.zip | |
WireGuardApp: Switch WireGuardKit to master branch
Signed-off-by: Andrej Mihajlov <and@mullvad.net>
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | WireGuard/WireGuard.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 |
3 files changed, 3 insertions, 5 deletions
@@ -40,8 +40,6 @@ $ open ./WireGuard/WireGuard.xcodeproj https://git.zx2c4.com/wireguard-apple ``` - Choose `am/swiftpm` branch in the "Rules" section. - 2. `WireGuardKit` links against `wireguard-go-bridge` library, but it cannot build it automatically due to Swift package manager limitations. So it needs a little help from a developer. Please follow the instructions below to create a build target(s) for `wireguard-go-bridge`. diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj index de57709..107c2a6 100644 --- a/WireGuard/WireGuard.xcodeproj/project.pbxproj +++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj @@ -1746,7 +1746,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://git.zx2c4.com/wireguard-apple"; requirement = { - branch = "am/wg-adapter-rebased"; + branch = master; kind = branch; }; }; diff --git a/WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 92e14ab..01be9af 100644 --- a/WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "package": "WireGuardKit", "repositoryURL": "https://git.zx2c4.com/wireguard-apple", "state": { - "branch": "am/wg-adapter-rebased", - "revision": "ca605363c05cda61fbd21e031f3fb5eee7f259c8", + "branch": "master", + "revision": "737f847c0db36429f7136fb514409c22e13a70ee", "version": null } } |