From a8fca8e2274b9a6622c441378d179cd27a7acc4a Mon Sep 17 00:00:00 2001 From: yungu0010 Date: Tue, 12 Nov 2024 18:42:34 +0900 Subject: [PATCH 1/4] fix: aline always_embed_swift_standard_libiraries with the xcode default --- Sources/XcodeProj/Utils/BuildSettingsProvider.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Sources/XcodeProj/Utils/BuildSettingsProvider.swift b/Sources/XcodeProj/Utils/BuildSettingsProvider.swift index 82a845c36..58fb88cad 100644 --- a/Sources/XcodeProj/Utils/BuildSettingsProvider.swift +++ b/Sources/XcodeProj/Utils/BuildSettingsProvider.swift @@ -373,10 +373,6 @@ public class BuildSettingsProvider { private static func targetSwiftSettings(platform: Platform, product: Product) -> BuildSettings { switch (platform, product) { - case (.watchOS, .application): - return [ - "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES": "YES", - ] default: return [:] } From 2866d8aa6498974880f6a522d21c9b04ea871311 Mon Sep 17 00:00:00 2001 From: yungu0010 Date: Tue, 12 Nov 2024 18:42:43 +0900 Subject: [PATCH 2/4] delete always_embed_swift_standard_libraries from test targetSettings watchOSApplication --- Tests/XcodeProjTests/Utils/BuildSettingsProviderTests.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Tests/XcodeProjTests/Utils/BuildSettingsProviderTests.swift b/Tests/XcodeProjTests/Utils/BuildSettingsProviderTests.swift index 4b65f3e19..c03339fce 100644 --- 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"], From 0f419ec56edd6ebe3435fe856f82549cfbd60bf1 Mon Sep 17 00:00:00 2001 From: yungu0010 Date: Wed, 13 Nov 2024 23:24:44 +0900 Subject: [PATCH 3/4] remove no longer used method --- Sources/XcodeProj/Utils/BuildSettingsProvider.swift | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Sources/XcodeProj/Utils/BuildSettingsProvider.swift b/Sources/XcodeProj/Utils/BuildSettingsProvider.swift index 58fb88cad..24faa7eb5 100644 --- a/Sources/XcodeProj/Utils/BuildSettingsProvider.swift +++ b/Sources/XcodeProj/Utils/BuildSettingsProvider.swift @@ -370,13 +370,6 @@ public class BuildSettingsProvider { return [:] } } - - private static func targetSwiftSettings(platform: Platform, product: Product) -> BuildSettings { - switch (platform, product) { - default: - return [:] - } - } } // Overloading `~=` enables customizing switch statement pattern matching From 82c410e846a44e1e4463b70f664cfbf210348b91 Mon Sep 17 00:00:00 2001 From: yungu0010 Date: Thu, 14 Nov 2024 00:03:57 +0900 Subject: [PATCH 4/4] fix build error --- Sources/XcodeProj/Utils/BuildSettingsProvider.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Sources/XcodeProj/Utils/BuildSettingsProvider.swift b/Sources/XcodeProj/Utils/BuildSettingsProvider.swift index 24faa7eb5..cc529a787 100644 --- 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 }