🔀️ Merge branch 'ladislas/bugfix/fastlane-tuist-signing' into develop

leka · Nov 29, 2024 · 4b1f02a · 4b1f02a
2 parents b265947 + 7921e42
commit 4b1f02a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Tuist/ProjectDescriptionHelpers/Project+App.swift b/Tuist/ProjectDescriptionHelpers/Project+App.swift
@@ -59,9 +59,14 @@ public extension Project {
             infoPlist: .extendingDefault(with: InfoPlist.extendingBase(version: version, with: infoPlist)),
             sources: ["Sources/**"],
             resources: .resources(["Resources/**"] + resources),
-            scripts: TargetScript.linters() + scripts, // Combine default scripts with custom scripts
+            scripts: TargetScript.linters() + scripts,
+            // Combine default scripts with custom scripts
             dependencies: dependencies,
-            settings: .settings(base: .extendingBase(with: settings)),
+            settings:
+            .settings(base:
+                .extendingBase(with: settings)
+                    .merging(SettingsDictionary.manualCodeSigning)
+            ),
             environmentVariables: [
                 "IDEPreferLogStreaming": "YES",
             ],

diff --git a/Tuist/ProjectDescriptionHelpers/SettingsDictionary+Base.swift b/Tuist/ProjectDescriptionHelpers/SettingsDictionary+Base.swift
@@ -36,6 +36,12 @@ public extension SettingsDictionary {
             settings = settings.otherSwiftFlags(["-D", "PRODUCTION_BUILD"])
         }
 
+        return settings
+    }
+
+    static var manualCodeSigning: SettingsDictionary {
+        var settings: SettingsDictionary = [:]
+
         if Environment.fastlaneBuild.getBoolean(default: false) {
             let bundleId = Environment.fastlaneMatchAppBundleId.getString(default: "")