refactor: align ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES with the Xcode default (#881)

yungu0010 · web-flow · commit 5e09f610f17c · 2024-11-20T13:49:38.000+01:00
* fix: aline always_embed_swift_standard_libiraries with the xcode default

* delete always_embed_swift_standard_libraries from test targetSettings watchOSApplication

* remove no longer used method

* fix build error
diff --git a/Sources/XcodeProj/Utils/BuildSettingsProvider.swift b/Sources/XcodeProj/Utils/BuildSettingsProvider.swift
@@ -72,10 +72,6 @@ public class BuildSettingsProvider {
             buildSettings.merge(targetSwiftSettings(product: product), uniquingKeysWith: { $1 })
         }
 
-        if let platform, let product, let swift, swift == true {
-            buildSettings.merge(targetSwiftSettings(platform: platform, product: product), uniquingKeysWith: { $1 })
-        }
-
         return buildSettings
     }
 
@@ -370,17 +366,6 @@ public class BuildSettingsProvider {
             return [:]
         }
     }
-
-    private static func targetSwiftSettings(platform: Platform, product: Product) -> BuildSettings {
-        switch (platform, product) {
-        case (.watchOS, .application):
-            return [
-                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
-            ]
-        default:
-            return [:]
-        }
-    }
 }
 
 // Overloading `~=` enables customizing switch statement pattern matching
diff --git a/Tests/XcodeProjTests/Utils/BuildSettingsProviderTests.swift b/Tests/XcodeProjTests/Utils/BuildSettingsProviderTests.swift
@@ -135,7 +135,6 @@ class BuildSettingProviderTests: XCTestCase {
 
         // Then
         assertEqualSettings(results, [
-            "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",
             "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
             "ENABLE_PREVIEWS": "YES",
             "LD_RUNPATH_SEARCH_PATHS": ["$(inherited)", "@executable_path/Frameworks"],

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,6 @@ public class BuildSettingsProvider {`
`72`	`72`	`buildSettings.merge(targetSwiftSettings(product: product), uniquingKeysWith: { $1 })`
`73`	`73`	`}`
`74`	`74`
`75`		`- if let platform, let product, let swift, swift == true {`
`76`		`- buildSettings.merge(targetSwiftSettings(platform: platform, product: product), uniquingKeysWith: { $1 })`
`77`		`- }`
`78`		`-`
`79`	`75`	`return buildSettings`
`80`	`76`	`}`
`81`	`77`
`@@ -370,17 +366,6 @@ public class BuildSettingsProvider {`
`370`	`366`	`return [:]`
`371`	`367`	`}`
`372`	`368`	`}`
`373`		`-`
`374`		`- private static func targetSwiftSettings(platform: Platform, product: Product) -> BuildSettings {`
`375`		`- switch (platform, product) {`
`376`		`- case (.watchOS, .application):`
`377`		`- return [`
`378`		`- "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES",`
`379`		`- ]`
`380`		`- default:`
`381`		`- return [:]`
`382`		`- }`
`383`		`- }`
`384`	`369`	`}`
`385`	`370`
`386`	`371`	// Overloading `~=` enables customizing switch statement pattern matching