diff options
| -rw-r--r-- | .github/workflows/ios.yml | 15 | ||||
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 41 |
2 files changed, 34 insertions, 22 deletions
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index cabe9c147a..c1defce099 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -45,6 +45,21 @@ jobs: cp Screenshots.xcconfig.template Screenshots.xcconfig working-directory: ios/Configurations + - name: Convert Package.resolved v2 -> v1 + run: | + jq '{ + "object": { + "pins": .pins | map({ + "package": .identity, + "repositoryURL": .location, + "state": .state + }) + }, + "version": 1 + }' Package.resolved > Package.resolved.out + mv Package.resolved.out Package.resolved + working-directory: ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm + - name: Build and test run: | xcodebuild test \ diff --git a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 83c0aec460..b46bfe3fa3 100644 --- a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,25 +1,22 @@ { - "object": { - "pins": [ - { - "package": "swift-log", - "repositoryURL": "https://github.com/apple/swift-log.git", - "state": { - "branch": null, - "revision": "173f567a2dfec11d74588eea82cecea555bdc0bc", - "version": "1.4.0" - } - }, - { - "package": "WireGuardKit", - "repositoryURL": "https://github.com/mullvad/wireguard-apple.git", - "state": { - "branch": "mullvad-master", - "revision": "eeb980058f5bff593868e34b718b4519a3236dcc", - "version": null - } + "pins" : [ + { + "identity" : "swift-log", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-log.git", + "state" : { + "revision" : "173f567a2dfec11d74588eea82cecea555bdc0bc", + "version" : "1.4.0" } - ] - }, - "version": 1 + }, + { + "identity" : "wireguard-apple", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mullvad/wireguard-apple.git", + "state" : { + "revision" : "eeb980058f5bff593868e34b718b4519a3236dcc" + } + } + ], + "version" : 2 } |