♻️ :: GenerateModule Script / 불필요한 Project.swift 재선언하는 코드 제거

Author: baekteun

Scripts/GenerateModule.swift

@@ -65,13 +65,13 @@ func registerModuleDependency() {
     }
     targetString += "\n\(tab(1))]"
     makeProjectSwift(targetString: targetString)
-    makeProjectScaffold(targetString: targetString)
+    makeSourceScaffold()
 }
 
 func tab(_ count: Int) -> String {
     var tabString = ""
     for _ in 0..<count {
-        tabString += "\t\t"
+        tabString += "    "
     }
     return tabString
 }
@@ -110,9 +110,9 @@ func makeDirectories(_ paths: [String]) {
 
 func makeProjectSwift(targetString: String) {
     let projectSwift = """
+import DependencyPlugin
 import ProjectDescription
 import ProjectDescriptionHelpers
-import DependencyPlugin
 
 let project = Project.module(
     name: ModulePaths.\(layer.rawValue).\(moduleName).rawValue,
@@ -130,10 +130,10 @@ func makeProjectDirectory() {
     makeDirectory(path: currentPath + "Projects/\(layer.rawValue)/\(moduleName)")
 }
 
-func makeProjectScaffold(targetString: String) {
+func makeSourceScaffold() {
     _ = try? bash.run(
         commandName: "tuist",
-        arguments: ["scaffold", "Module", "--name", "\(moduleName)", "--layer", "\(layer.rawValue)", "--target", "\(targetString)"]
+        arguments: ["scaffold", "Sources", "--name", "\(moduleName)", "--layer", "\(layer.rawValue)"]
     )
 }
 

Tuist/Templates/Module/Project.stencil

@@ -1,10 +1,8 @@
+import DependencyPlugin
 import ProjectDescription
 import ProjectDescriptionHelpers
-import DependencyPlugin
 
-let project = Project.makeModule(
+let project = Project.module(
     name: ModulePaths.{{ layer }}.{{ name }}.rawValue,
-    product: .staticLibrary,
-    targets: {{ target }},
-    internalDependencies: []
+    targets: {{ target }}
 )