Allow slash in non-uti-compliant target names

Sources/TuistAcceptanceTesting/TuistAcceptanceFixtures.swift

@@ -41,6 +41,7 @@ public enum TuistAcceptanceFixtures {
     case iosAppWithPrivacyManifest
     case iosAppWithRemoteBinarySwiftPackage
     case iosAppWithRemoteSwiftPackage
+    case iosAppWithSpmDependencies
     case iosAppWithStaticFrameworks
     case iosAppWithStaticLibraries
     case iosAppWithStaticLibraryAndPackage
@@ -142,6 +143,8 @@ public enum TuistAcceptanceFixtures {
             return "ios_app_with_multi_configs"
         case .iosAppWithOnDemandResources:
             return "ios_app_with_on_demand_resources"
+        case .iosAppWithSpmDependencies:
+            return "ios_app_with_spm_dependencies"
         case .iosAppWithPluginsAndTemplates:
             return "ios_app_with_plugins_and_templates"
         case .iosAppWithPrivacyManifest:

Sources/TuistGenerator/Linter/TargetLinter.swift

@@ -62,7 +62,7 @@ class TargetLinter: TargetLinting {
         bundleIdentifier = bundleIdentifier.replacingOccurrences(of: "\\$\\(.+\\)", with: "", options: .regularExpression)
 
         var allowed = CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
-        allowed.formUnion(CharacterSet(charactersIn: "-."))
+        allowed.formUnion(CharacterSet(charactersIn: "-./"))
 
         if !bundleIdentifier.unicodeScalars.allSatisfy({ allowed.contains($0) }) {
             let reason =

Sources/TuistGenerator/Mappers/ResourcesProjectMapper.swift

@@ -36,7 +36,10 @@ public class ResourcesProjectMapper: ProjectMapping { // swiftlint:disable:this
         var additionalTargets: [Target] = []
         var sideEffects: [SideEffectDescriptor] = []
 
-        let bundleName = "\(project.name)_\(target.name.replacingOccurrences(of: "-", with: "_"))"
+        let sanitizedTargetName = target.name
+            .replacingOccurrences(of: "-", with: "_")
+            .replacingOccurrences(of: "/", with: "_")
+        let bundleName = "\(project.name)_\(sanitizedTargetName)"
         var modifiedTarget = target
 
         if !target.supportsResources {

Sources/TuistGraph/Models/Target.swift

@@ -84,6 +84,7 @@ public struct Target: Equatable, Hashable, Comparable, Codable {
         self.destinations = destinations
         self.bundleId = bundleId
         self.productName = productName ?? name.replacingOccurrences(of: "-", with: "_")
+            .replacingOccurrences(of: "/", with: "_")
         self.deploymentTargets = deploymentTargets
         self.infoPlist = infoPlist
         self.entitlements = entitlements

Sources/TuistLoader/SwiftPackageManager/PackageInfoMapper.swift

@@ -375,6 +375,7 @@ public final class PackageInfoMapper: PackageInfoMapping {
 
     fileprivate class func sanitize(targetName: String) -> String {
         targetName.replacingOccurrences(of: ".", with: "_")
+            .replacingOccurrences(of: "/", with: "_")
     }
 
     // swiftlint:disable:next function_body_length
@@ -594,9 +595,9 @@ public final class PackageInfoMapper: PackageInfoMapping {
             product: product,
             productName: PackageInfoMapper
                 .sanitize(targetName: target.name)
-                .replacingOccurrences(of: "-", with: "_"),
+                .replacingOccurrences(of: "-", with: "_").replacingOccurrences(of: "/", with: "_"),
             bundleId: target.name
-                .replacingOccurrences(of: "_", with: "."),
+                .replacingOccurrences(of: "_", with: ".").replacingOccurrences(of: "/", with: "."),
             deploymentTargets: deploymentTargets,
             infoPlist: .default,
             sources: sources,

Sources/TuistLoader/SwiftPackageManager/SwiftPackageManagerModuleMapGenerator.swift

@@ -57,6 +57,7 @@ public final class SwiftPackageManagerModuleMapGenerator: SwiftPackageManagerMod
         publicHeadersPath: AbsolutePath
     ) throws -> ModuleMap {
         let sanitizedModuleName = moduleName.replacingOccurrences(of: "-", with: "_")
+            .replacingOccurrences(of: "/", with: "_")
         let umbrellaHeaderPath = publicHeadersPath.appending(component: sanitizedModuleName + ".h")
         let nestedUmbrellaHeaderPath = publicHeadersPath
             .appending(components: sanitizedModuleName, moduleName + ".h")

Tests/TuistAutomationAcceptanceTests/BuildAcceptanceTests.swift

@@ -144,6 +144,15 @@ final class BuildAcceptanceTestAppWithSPMDependencies: TuistAcceptanceTestCase {
     }
 }
 
+final class BuildAcceptanceTestIosAppWithSPMDependencies: TuistAcceptanceTestCase {
+    func test() async throws {
+        try setUpFixture(.iosAppWithSpmDependencies)
+        try await run(InstallCommand.self)
+        try await run(GenerateCommand.self)
+        try await run(BuildCommand.self, "App", "--platform", "ios")
+    }
+}
+
 final class BuildAcceptanceTestMultiplatformAppWithMacrosAndEmbeddedWatchOSApp: TuistAcceptanceTestCase {
     func test() async throws {
         try setUpFixture(.multiplatformAppWithMacrosAndEmbeddedWatchOSApp)

Tests/TuistDependenciesAcceptanceTests/DependenciesAcceptanceTests.swift

@@ -16,6 +16,16 @@ final class DependenciesAcceptanceTestAppWithSPMDependencies: TuistAcceptanceTes
     }
 }
 
+final class DependenciesAcceptanceTestIosAppWithSPMDependencies: TuistAcceptanceTestCase {
+    func test_ios_app_spm_dependencies() async throws {
+        try setUpFixture(.iosAppWithSpmDependencies)
+        try await run(InstallCommand.self)
+        try await run(GenerateCommand.self)
+        try await run(BuildCommand.self, "App")
+        try await run(TestCommand.self, "App")
+    }
+}
+
 final class DependenciesAcceptanceTestAppWithSPMDependenciesWithoutInstall: TuistAcceptanceTestCase {
     func test() async throws {
         try setUpFixture(.appWithSpmDependencies)

Tests/TuistGeneratorTests/ProjectMappers/ResourcesProjectMapperTests.swift

@@ -428,7 +428,10 @@ final class ResourcesProjectMapperTests: TuistUnitTestCase {
         // Given
         let projectName = "sdk-with-dash"
         let targetName = "target-with-dash"
-        let expectedBundleName = "\(projectName)_\(targetName.replacingOccurrences(of: "-", with: "_"))"
+        let sanitizedTargetName = targetName
+            .replacingOccurrences(of: "-", with: "_")
+            .replacingOccurrences(of: "/", with: "_")
+        let expectedBundleName = "\(projectName)_\(sanitizedTargetName)"
         let sources: [SourceFile] = ["/ViewController.m", "/ViewController2.swift"]
         let resources: [ResourceFileElement] = [.file(path: "/AbsolutePath/Project/Resources/image.png")]
         let target = Target.test(name: targetName, product: .staticLibrary, sources: sources, resources: .init(resources))

fixtures/ios_app_with_spm_dependencies/App/Resources/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

fixtures/ios_app_with_spm_dependencies/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

fixtures/ios_app_with_spm_dependencies/App/Resources/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

fixtures/ios_app_with_spm_dependencies/App/Resources/Preview Content/Preview Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

fixtures/ios_app_with_spm_dependencies/App/Sources/AppApp.swift

@@ -0,0 +1,10 @@
+import SwiftUI
+
+@main
+struct AppApp: App {
+    var body: some Scene {
+        WindowGroup {
+            ContentView()
+        }
+    }
+}

fixtures/ios_app_with_spm_dependencies/App/Sources/ContentView.swift

@@ -0,0 +1,22 @@
+import KSCrash_Installations
+import SwiftUI
+
+struct ContentView: View {
+    init() {
+        // Use KSCrash
+        _ = KSCrashInstallationStandard()
+    }
+
+    var body: some View {
+        VStack {
+            Image(systemName: "globe")
+                .imageScale(.large)
+            Text("Hello, world!")
+        }
+        .padding()
+    }
+}
+
+#Preview {
+    ContentView()
+}

fixtures/ios_app_with_spm_dependencies/AppTests/AppTests.swift

@@ -0,0 +1,20 @@
+import XCTest
+@testable import App
+
+final class AppTests: XCTestCase {
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+        // Any test you write for XCTest can be annotated as throws and async.
+        // Mark your test throws to produce an unexpected failure when your test encounters an uncaught error.
+        // Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions afterwards.
+    }
+}

fixtures/ios_app_with_spm_dependencies/Project.swift

@@ -0,0 +1,31 @@
+import ProjectDescription
+
+let project = Project(
+    name: "App",
+    targets: [
+        .target(
+            name: "App",
+            destinations: .iOS,
+            product: .app,
+            bundleId: "io.tuist.app",
+            deploymentTargets: .iOS("14.0"),
+            infoPlist: .default,
+            sources: "App/Sources/**",
+            resources: "App/Resources/**",
+            dependencies: [
+                .external(name: "KSCrash"),
+                .sdk(name: "c++", type: .library, status: .required),
+            ]
+        ),
+        .target(
+            name: "AppTests",
+            destinations: .iOS,
+            product: .unitTests,
+            bundleId: "io.tuist.app.tests",
+            deploymentTargets: .iOS("14.0"),
+            infoPlist: .default,
+            sources: "AppTests/**",
+            dependencies: [.target(name: "App")]
+        ),
+    ]
+)

fixtures/ios_app_with_spm_dependencies/README.md

@@ -0,0 +1,3 @@
+# iOS app with SPM dependencies
+
+An iOS application project with various SPM dependencies.

fixtures/ios_app_with_spm_dependencies/Tuist/Package.resolved

@@ -0,0 +1,15 @@
+{
+  "originHash" : "664db39a62d139ec20362d815bf22a4a4df6691783532796a140f210d57f4612",
+  "pins" : [
+    {
+      "identity" : "kscrash",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kstenerud/KSCrash",
+      "state" : {
+        "revision" : "0ad825211ec38404e03b6f677a2312deb728528a",
+        "version" : "1.17.1"
+      }
+    }
+  ],
+  "version" : 3
+}

fixtures/ios_app_with_spm_dependencies/Tuist/Package.swift

@@ -0,0 +1,10 @@
+// swift-tools-version: 5.10
+import PackageDescription
+
+let package = Package(
+    name: "PackageName",
+    dependencies: [
+        // Has targets with names not compliant with UTI (with "/" in their names)
+        .package(url: "https://github.com/kstenerud/KSCrash", exact: "1.17.1"),
+    ]
+)