Fix default settings for multiplatform targets (tuist#7295)

hiltonc · Feb 4, 2025 · 46a1772 · 46a1772
1 parent 717d701
commit 46a1772
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/Sources/TuistGenerator/Settings/DefaultSettingsProvider.swift b/Sources/TuistGenerator/Settings/DefaultSettingsProvider.swift
@@ -146,7 +146,18 @@ public final class DefaultSettingsProvider: DefaultSettingsProviding {
                 let filteredSettings = platformSetting
                     .filter { !DefaultSettingsProvider.multiplatformExcludedSettingsKeys.contains($0.key) }
 
-                settings.overlay(with: filteredSettings, for: platform)
+                for (key, newValue) in filteredSettings {
+                    if settings[key] == nil {
+                        settings[key] = newValue
+                    } else if settings[key] != newValue {
+                        let newKey = "\(key)[sdk=\(platform.xcodeSdkRoot)*]"
+                        settings[newKey] = newValue
+                        if platform.hasSimulators, let simulatorSDK = platform.xcodeSimulatorSDK {
+                            let newKey = "\(key)[sdk=\(simulatorSDK)*]"
+                            settings[newKey] = newValue
+                        }
+                    }
+                }
             }
         } else if let platform = target.supportedPlatforms.first {
             settings = try await targetSettings(

diff --git a/Tests/TuistGeneratorTests/Generator/ConfigGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/ConfigGeneratorTests.swift
@@ -688,9 +688,8 @@ final class ConfigGeneratorTests: TuistUnitTestCase {
             "SDKROOT": "auto",
             "TARGETED_DEVICE_FAMILY": "1,2",
             "SUPPORTED_PLATFORMS": "iphoneos iphonesimulator macosx",
+            "LD_RUNPATH_SEARCH_PATHS": ["$(inherited)", "@executable_path/Frameworks"],
             "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]": ["$(inherited)", "@executable_path/../Frameworks"],
-            "LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*]": ["$(inherited)", "@executable_path/Frameworks"],
-            "LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*]": ["$(inherited)", "@executable_path/Frameworks"],
         ]
 
         assert(config: debugConfig, contains: expectedSettings)

diff --git a/Tests/TuistGeneratorTests/Settings/DefaultSettingsProviderTests.swift b/Tests/TuistGeneratorTests/Settings/DefaultSettingsProviderTests.swift
@@ -123,34 +123,23 @@ final class DefaultSettingsProvider_iOSTests: TuistUnitTestCase {
         "SWIFT_VERSION": "5.0",
     ]
 
-    private let multiplatformFrameworkTargetEssentialDebugSettings: [String: SettingValue] = ([
+    private let multiplatformFrameworkTargetEssentialDebugSettings: [String: SettingValue] = [
         "SWIFT_ACTIVE_COMPILATION_CONDITIONS": .array(["$(inherited)", "DEBUG"]),
         "SKIP_INSTALL": "YES",
         "VERSIONING_SYSTEM": "apple-generic",
         "DYLIB_CURRENT_VERSION": "1",
         "DYLIB_INSTALL_NAME_BASE": "@rpath",
         "PRODUCT_NAME": "$(TARGET_NAME:c99extidentifier)",
         "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
-        "LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*]": ["$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks"],
-        "LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*]": ["$(inherited)", "@executable_path/Frameworks",
-                                                          "@loader_path/Frameworks"],
+        "LD_RUNPATH_SEARCH_PATHS": ["$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks"],
         "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]": ["$(inherited)", "@executable_path/../Frameworks", "@loader_path/../Frameworks"],
         "DEFINES_MODULE": "YES",
         "VERSION_INFO_PREFIX": "",
         "CURRENT_PROJECT_VERSION": "1",
         "INSTALL_PATH": "$(LOCAL_LIBRARY_DIR)/Frameworks",
         "DYLIB_COMPATIBILITY_VERSION": "1",
         "SWIFT_VERSION": "5.0",
-    ] as [String: SettingValue])
-        .reduce(into: [String: SettingValue]()) { acc, element in
-            if element.key.contains("sdk") {
-                acc[element.key] = element.value
-            } else {
-                acc["\(element.key)[sdk=macosx*]"] = element.value
-                acc["\(element.key)[sdk=iphonesimulator*]"] = element.value
-                acc["\(element.key)[sdk=iphoneos*]"] = element.value
-            }
-        }
+    ]
 
     override func setUp() {
         super.setUp()