WireGuardApp: Switch WireGuardKit to master branch

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

diff --git a/README.md b/README.md
index 15557c1c27983fd13bb6dd63d247735a15339e83..3b2d53b419cb9ddbc2261173c8d8dd07d80c8d8e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -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 de5770921b47933b26651a704a2334c7994df541..107c2a6587487466730c23a45ab9af7031452bd2 100644 (file)
--- 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 92e14ab8a2f5bec28922ccd5838f38fb5dc8db57..01be9af1696e647a9180abb0f635f3c9caf0bc92 100644 (file)
--- 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
         }
       }