diff --git a/.swiftlint.yml b/.swiftlint.yml index ec1acf82..efcb8a6e 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -5,7 +5,7 @@ included: excluded: - {PROJECT_NAME}Tests/Sources/Mocks/Sourcery/AutoMockable.generated.swift - - {PROJECT_NAME}/Sources/Supports/Helpers/R.swift/R.generated.swift + - {PROJECT_NAME}/Sources/Supports/Helpers/Rswift/R.generated.swift - Pods - Derived - DerivedData diff --git a/Tuist/ProjectDescriptionHelpers/TargetAction+Initializing.swift b/Tuist/ProjectDescriptionHelpers/TargetAction+Initializing.swift index e0d60f89..50a0fca2 100644 --- a/Tuist/ProjectDescriptionHelpers/TargetAction+Initializing.swift +++ b/Tuist/ProjectDescriptionHelpers/TargetAction+Initializing.swift @@ -14,7 +14,7 @@ extension TargetAction { public static func rswiftAction() -> TargetAction { let rswiftPath = "$PODS_ROOT/R.swift/rswift" let inputPath = "$TEMP_DIR/rswift-lastrun" - let outputPath = "$SRCROOT/$PROJECT_NAME/Sources/Supports/Helpers/R.swift/R.generated.swift" + let outputPath = "$SRCROOT/$PROJECT_NAME/Sources/Supports/Helpers/Rswift/R.generated.swift" return .pre( script: "\"\(rswiftPath)\" generate \"\(outputPath)\"", name: "R.swift", diff --git a/make.sh b/make.sh index fb915733..4690a5e3 100644 --- a/make.sh +++ b/make.sh @@ -117,6 +117,10 @@ rename_folder "${CONSTANT_PROJECT_NAME}" "${PROJECT_NAME_NO_SPACES}" mkdir -p "${PROJECT_NAME_NO_SPACES}Tests/Sources/Mocks/Sourcery" touch "${PROJECT_NAME_NO_SPACES}Tests/Sources/Mocks/Sourcery/AutoMockable.generated.swift" +# Add R.generated.swift file +mkdir -p "${PROJECT_NAME_NO_SPACES}/Sources/Supports/Helpers/Rswift" +touch "${PROJECT_NAME_NO_SPACES}/Sources/Supports/Helpers/Rswift/R.generated.swift" + echo "✅ Completed" # Search and replace in files @@ -163,4 +167,4 @@ rm -rf .github/workflows/test_install_script.yml echo "✅ Completed" # Done! -echo "=> 🚀 Done! App is ready to be tested 🙌" \ No newline at end of file +echo "=> 🚀 Done! App is ready to be tested 🙌"