Fix Xcode 13 builds (#177)

mxcl · Oct 10, 2021 · d279183 · d279183
1 parent dfd630c
commit d279183
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,20 +8,15 @@ on:
     - cron: '3 3 * * 0'  # 3:03 AM, every Sunday
 jobs:
   macOS:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.swift > 5.3 && 'macos-11' || 'macos-10.15' }}
     strategy:
       matrix:
         swift:
           - 5.1
           - 5.2
           - 5.3
-        os:
-          - macos-10.15
-        include:
-          - swift: 5.4
-            os: macos-11
-          - swift: 5.5
-            os: macos-11
+          - 5.4
+          - 5.5
     steps:
     - uses: actions/checkout@v2
     - uses: mxcl/xcodebuild@v1
@@ -32,13 +27,13 @@ jobs:
     strategy:
       matrix:
         swift:
-          - swift:5.1
-          - swift:5.2
-          - swift:5.3
-          - swift:5.4
-          - swiftlang/swift:nightly-5.5
+          - 5.1
+          - 5.2
+          - 5.3
+          - 5.4
+          - 5.5
     container:
-      image: ${{ matrix.swift }}
+      image: swift:${{ matrix.swift }}
     steps:
     - uses: actions/checkout@v2
     - run: swift test -Xswiftc -suppress-warnings --enable-test-discovery
diff --git a/Package.resolved b/Package.resolved
@@ -3,56 +3,56 @@
     "pins": [
       {
         "package": "AEXML",
-        "repositoryURL": "https://github.com/tadija/AEXML",
+        "repositoryURL": "https://github.com/tadija/AEXML.git",
         "state": {
           "branch": null,
-          "revision": "8623e73b193386909566a9ca20203e33a09af142",
-          "version": "4.5.0"
+          "revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
+          "version": "4.6.1"
         }
       },
       {
         "package": "CryptoSwift",
         "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift",
         "state": {
           "branch": null,
-          "revision": "4e31051c63cc0ddf10a25cf5318856c510cf77f4",
-          "version": "1.4.0"
+          "revision": "4b0565384d3c4c588af09e660535b2c7c9bf5b39",
+          "version": "1.4.2"
         }
       },
       {
         "package": "LegibleError",
         "repositoryURL": "https://github.com/mxcl/LegibleError",
         "state": {
           "branch": null,
-          "revision": "909e9bab3ded97350b28a5ab41dd745dd8aa9710",
-          "version": "1.0.4"
+          "revision": "3aeb15455edc0cd6ea0e8d562079db4ab9a25afc",
+          "version": "1.0.5"
         }
       },
       {
         "package": "Path.swift",
         "repositoryURL": "https://github.com/mxcl/Path.swift",
         "state": {
           "branch": null,
-          "revision": "142d4bc1118602f3679c777d2e0da89c227cd918",
-          "version": "1.2.0"
+          "revision": "9c6f807b0a76be0e27aecc908bc6f173400d839e",
+          "version": "1.4.0"
         }
       },
       {
         "package": "PathKit",
-        "repositoryURL": "https://github.com/kylef/PathKit",
+        "repositoryURL": "https://github.com/kylef/PathKit.git",
         "state": {
           "branch": null,
-          "revision": "73f8e9dca9b7a3078cb79128217dc8f2e585a511",
-          "version": "1.0.0"
+          "revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
+          "version": "1.0.1"
         }
       },
       {
         "package": "Spectre",
         "repositoryURL": "https://github.com/kylef/Spectre.git",
         "state": {
           "branch": null,
-          "revision": "f79d4ecbf8bc4e1579fbd86c3e1d652fb6876c53",
-          "version": "0.9.2"
+          "revision": "26cc5e9ae0947092c7139ef7ba612e34646086c7",
+          "version": "0.10.1"
         }
       },
       {
@@ -69,17 +69,17 @@
         "repositoryURL": "https://github.com/mxcl/Version",
         "state": {
           "branch": null,
-          "revision": "a94b48f36763c05629fc102837398505032dead9",
-          "version": "2.0.0"
+          "revision": "1fe824b80d89201652e7eca7c9252269a1d85e25",
+          "version": "2.0.1"
         }
       },
       {
-        "package": "xcodeproj",
+        "package": "XcodeProj",
         "repositoryURL": "https://github.com/tuist/xcodeproj",
         "state": {
           "branch": null,
-          "revision": "45e349e1c4e4da1a85a7b9392b737acde2e2f2a8",
-          "version": "7.23.0"
+          "revision": "446f3a0db73e141c7f57e26fcdb043096b1db52c",
+          "version": "8.3.1"
         }
       }
     ]

diff --git a/Package@swift-5.3.swift b/Package@swift-5.3.swift
@@ -17,7 +17,7 @@ let package = Package(
         .package(url: "https://github.com/mxcl/StreamReader", from: "1.0.0"),
         .package(url: "https://github.com/mxcl/LegibleError", from: "1.0.0"),
         .package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
-        .package(url: "https://github.com/krzyzanowskim/CryptoSwift", from: "1.4.0"),
+        .package(url: "https://github.com/krzyzanowskim/CryptoSwift", from: "1.4.2"),
     ],
     targets: [
         .target(
@@ -48,5 +48,5 @@ let package = Package(
 #if os(macOS)
 package.products.append(.executable(name: "swift-sh-edit", targets: ["swift-sh-edit"]))
 package.targets.append(.target(name: "swift-sh-edit", dependencies: ["XcodeProj", "Utility"]))
-package.dependencies.append(.package(name: "XcodeProj", url: "https://github.com/tuist/xcodeproj", from: "7.0.0"))
+package.dependencies.append(.package(name: "XcodeProj", url: "https://github.com/tuist/xcodeproj", from: "8.3.1"))
 #endif