fixup

Author: tomerd

Sources/Build/LLBuildManifestBuilder.swift

@@ -171,18 +171,18 @@ extension LLBuildManifestBuilder {
     /// Returns the virtual node that will build the entire bundle.
     private func createResourcesBundle(
         for target: TargetBuildDescription
-    ) -> Node? {
+    ) throws -> Node? {
         guard let bundlePath = target.bundlePath else { return nil }
 
         var outputs: [Node] = []
 
-        let infoPlistDestination = try! RelativePath(validating: "Info.plist") // try! safe
+        let infoPlistDestination = try RelativePath(validating: "Info.plist")
 
         // Create a copy command for each resource file.
         for resource in target.resources {
             switch resource.rule {
             case .copy, .process:
-                let destination = bundlePath.appending(resource.destination)
+                let destination = try bundlePath.appending(resource.destination)
                 let (_, output) = addCopyCommand(from: resource.path, to: destination)
                 outputs.append(output)
             case .embedInCode:
@@ -604,7 +604,7 @@ extension LLBuildManifestBuilder {
         // don't need to block building of a module until its resources are assembled but
         // we don't currently have a good way to express that resources should be built
         // whenever a module is being built.
-        if let resourcesNode = createResourcesBundle(for: .swift(target)) {
+        if let resourcesNode = try createResourcesBundle(for: .swift(target)) {
             inputs.append(resourcesNode)
         }
 
@@ -798,7 +798,7 @@ extension LLBuildManifestBuilder {
         // don't need to block building of a module until its resources are assembled but
         // we don't currently have a good way to express that resources should be built
         // whenever a module is being built.
-        if let resourcesNode = createResourcesBundle(for: .clang(target)) {
+        if let resourcesNode = try createResourcesBundle(for: .clang(target)) {
             inputs.append(resourcesNode)
         }
 

Sources/PackageLoading/TargetSourcesBuilder.swift

@@ -174,10 +174,10 @@ public struct TargetSourcesBuilder {
         let ignored = pathToRule.filter { $0.value == .ignored }.map { $0.key }
         let others = pathToRule.filter { $0.value == .none }.map { $0.key }
 
-        diagnoseConflictingResources(in: resources)
+        try diagnoseConflictingResources(in: resources)
         diagnoseCopyConflictsWithLocalizationDirectories(in: resources)
         diagnoseLocalizedAndUnlocalizedVariants(in: resources)
-        diagnoseInfoPlistConflicts(in: resources)
+        try diagnoseInfoPlistConflicts(in: resources)
         diagnoseInvalidResource(in: target.resources)
 
         // It's an error to contain mixed language source files.
@@ -309,10 +309,10 @@ public struct TargetSourcesBuilder {
         return Self.resource(for: path, with: rule, defaultLocalization: defaultLocalization, targetName: target.name, targetPath: targetPath, observabilityScope: observabilityScope)
     }
 
-    private func diagnoseConflictingResources(in resources: [Resource]) {
-        let duplicateResources = resources.spm_findDuplicateElements(by: \.destination)
+    private func diagnoseConflictingResources(in resources: [Resource]) throws {
+        let duplicateResources = resources.spm_findDuplicateElements(by: \.destinationForGrouping)
         for resources in duplicateResources {
-            self.observabilityScope.emit(.conflictingResource(path: resources[0].destination, targetName: target.name))
+            try self.observabilityScope.emit(.conflictingResource(path: resources[0].destination, targetName: target.name))
 
             for resource in resources {
                 let relativePath = resource.path.relative(to: targetPath)
@@ -346,9 +346,9 @@ public struct TargetSourcesBuilder {
         }
     }
 
-    private func diagnoseInfoPlistConflicts(in resources: [Resource]) {
+    private func diagnoseInfoPlistConflicts(in resources: [Resource]) throws {
         for resource in resources {
-            if try! resource.destination == RelativePath(validating: "Info.plist") /* try! safe */ {
+            if try resource.destination == RelativePath(validating: "Info.plist") {
                 self.observabilityScope.emit(.infoPlistResourceConflict(
                     path: resource.path.relative(to: targetPath),
                     targetName: target.name))
@@ -770,3 +770,13 @@ extension PackageReference.Kind {
         }
     }
 }
+
+extension PackageModel.Resource {
+    fileprivate var destinationForGrouping: RelativePath? {
+        do {
+            return try self.destination
+        } catch {
+            return .none
+        }
+    }
+}

Sources/PackageModel/Resource.swift

@@ -24,11 +24,13 @@ public struct Resource: Codable, Equatable {
 
     /// The relative location of the resource in the resource bundle.
     public var destination: RelativePath {
-        switch self.rule {
-        case .process(.some(let localization)):
-            return try! RelativePath(validating: "\(localization).\(Self.localizationDirectoryExtension)/\(path.basename)") // try! safe
-        default:
-            return try! RelativePath(validating: path.basename) // try! safe
+        get throws {
+            switch self.rule {
+            case .process(.some(let localization)):
+                return try RelativePath(validating: "\(localization).\(Self.localizationDirectoryExtension)/\(path.basename)")
+            default:
+                return try RelativePath(validating: path.basename)
+            }
         }
     }