Fix generation of SPM packages when some resources are missing

tuist · Mar 4, 2024 · 7d86d0a · 7d86d0a
1 parent c65bcc3
commit 7d86d0a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/Sources/TuistLoader/SwiftPackageManager/PackageInfoMapper.swift b/Sources/TuistLoader/SwiftPackageManager/PackageInfoMapper.swift
@@ -766,6 +766,18 @@ extension ResourceFileElements {
                 return try handleProcessResource(resourceAbsolutePath: resourceAbsolutePath)
             }
         }
+            .filter {
+                switch $0 {
+                case let .glob(pattern: pattern, excluding: _, tags: _, inclusionCondition: _):
+                    // We will automatically skip including globs of non-existing directories for packages
+                    if !FileHandler.shared.exists(try AbsolutePath(validating: String(pattern.pathString)).parentDirectory) {
+                        return false
+                    }
+                    return true
+                case .folderReference:
+                    return true
+                }
+            }
 
         // Add default resources path if necessary
         // They are handled like a `.process` rule

diff --git a/Tests/TuistLoaderTests/SwiftPackageManager/PackageInfoMapperTests.swift b/Tests/TuistLoaderTests/SwiftPackageManager/PackageInfoMapperTests.swift
@@ -907,7 +907,7 @@ final class PackageInfoMapperTests: TuistUnitTestCase {
             ]
         )
 
-        XCTAssertEqual(
+        XCTAssertBetterEqual(
             project,
             .testWithDefaultConfigs(
                 name: "Package",

diff --git a/fixtures/app_with_spm_dependencies/App/Project.swift b/fixtures/app_with_spm_dependencies/App/Project.swift
@@ -41,6 +41,7 @@ let project = Project(
                 .external(name: "libzstd"),
                 .external(name: "NYTPhotoViewer"),
                 .external(name: "SVProgressHUD"),
+                .external(name: "AirshipPreferenceCenter"),
             ],
             settings: .targetSettings
         ),

diff --git a/fixtures/app_with_spm_dependencies/Tuist/Package.resolved b/fixtures/app_with_spm_dependencies/Tuist/Package.resolved
@@ -90,6 +90,15 @@
         "version" : "2.0.0"
       }
     },
+    {
+      "identity" : "ios-library",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/urbanairship/ios-library.git",
+      "state" : {
+        "revision" : "53040c77617a2acc5d9a7b69cf5bbbf36f94ad4b",
+        "version" : "17.7.3"
+      }
+    },
     {
       "identity" : "nimble",
       "kind" : "remoteSourceControl",

diff --git a/fixtures/app_with_spm_dependencies/Tuist/Package.swift b/fixtures/app_with_spm_dependencies/Tuist/Package.swift
@@ -32,6 +32,8 @@ let package = Package(
         .package(url: "https://github.com/Quick/Quick", exact: "7.4.0"),
         .package(url: "https://github.com/Quick/Nimble", exact: "13.2.0"),
         .package(url: "https://github.com/SVProgressHUD/SVProgressHUD", exact: "2.3.1"),
+        // Has missing resources
+        .package(url: "https://github.com/urbanairship/ios-library.git", .exact("17.7.3")),
         .package(path: "../LocalSwiftPackage"),
         .package(path: "../StringifyMacro"),
     ]