Update XcodeProj, fix compatibility issue (#32)

* Update XcodeProj, fix compatibility issue * Fix compilation on older Xcode * Use Swift 5.10.1 on Linux --------- Co-authored-by: Michael Gerasymenko <michael.gerasymenko@tamara.co>
mikeger · Oct 1, 2024 · a441576 · a441576
1 parent bf995f5
commit a441576
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,6 +18,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
+    - uses: swift-actions/setup-swift@v2
+      with:
+        swift-version: "5.10.1"
+    - name: Get swift version
+      run: swift --version # Swift 5.1.0
     - name: Prepare Git
       run: git config --global user.email "test@example.com" && git config --global user.name "Test User"
     - name: Run tests

diff --git a/Package.resolved b/Package.resolved
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tuist/XcodeProj.git",
       "state" : {
-        "revision" : "313aaf1ad612135b7b0ccf731c86b5c07bf149b5",
-        "version" : "8.20.0"
+        "revision" : "babd2491ea34777bec9d33381a60cd782559b4b3",
+        "version" : "8.24.1"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -69,7 +69,7 @@ let package = Package(
     ],
     products: products,
     dependencies: [
-        .package(url: "https://github.com/tuist/XcodeProj.git", .upToNextMajor(from: "8.20.0")),
+        .package(url: "https://github.com/tuist/XcodeProj.git", .upToNextMajor(from: "8.24.1")),
         .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "1.2.0")),
         .package(url: "https://github.com/kylef/PathKit.git", .upToNextMinor(from: "1.0.0")),
         .package(url: "https://github.com/onevcat/Rainbow", .upToNextMajor(from: "4.0.0")),

diff --git a/Plugins/SelectiveTestingPlugin/SelectiveTestingPlugin.swift b/Plugins/SelectiveTestingPlugin/SelectiveTestingPlugin.swift
@@ -56,6 +56,12 @@ struct SelectiveTestingPlugin: CommandPlugin {
     }
 #endif
 
+#if compiler(>=6)
 extension String: @retroactive LocalizedError {
     public var errorDescription: String? { return self }
 }
+#else
+extension String: LocalizedError {
+    public var errorDescription: String? { return self }
+}
+#endif
diff --git a/Sources/DependencyCalculator/DependencyGraph.swift b/Sources/DependencyCalculator/DependencyGraph.swift
@@ -273,7 +273,7 @@ extension WorkspaceInfo {
             }
 
             // Package dependencies
-            for packageDependency in target.packageProductDependencies {
+            for packageDependency in (target.packageProductDependencies ?? []) {
                 let package = packageDependency.productName
                 guard let packageMetadata = packagesByName[package] else {
                     Logger.warning("Package \(package) not found")