Update XcodeProj, fix compatibility issue (#32)

mikeger · Michael Gerasymenko · web-flow · commit a44157629466 · 2024-10-01T08:43:47.000+02:00
* Update XcodeProj, fix compatibility issue

* Fix compilation on older Xcode

* Use Swift 5.10.1 on Linux

---------

Co-authored-by: Michael Gerasymenko &lt;michael.gerasymenko@tamara.co&gt;
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
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")

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,12 @@ struct SelectiveTestingPlugin: CommandPlugin {`
`56`	`56`	`}`
`57`	`57`	`#endif`
`58`	`58`
	`59`	`+#if compiler(>=6)`
`59`	`60`	`extension String: @retroactive LocalizedError {`
`60`	`61`	`public var errorDescription: String? { return self }`
`61`	`62`	`}`
	`63`	`+#else`
	`64`	`+extension String: LocalizedError {`
	`65`	`+ public var errorDescription: String? { return self }`
	`66`	`+}`
	`67`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ extension WorkspaceInfo {`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`// Package dependencies`
`276`		`- for packageDependency in target.packageProductDependencies {`
	`276`	`+ for packageDependency in (target.packageProductDependencies ?? []) {`
`277`	`277`	`let package = packageDependency.productName`
`278`	`278`	`guard let packageMetadata = packagesByName[package] else {`
`279`	`279`	`Logger.warning("Package \(package) not found")`