From ac41e95392f1a4cb4f0361a63563cf5ca0547189 Mon Sep 17 00:00:00 2001 From: Eric Amorde Date: Thu, 31 Oct 2024 10:03:15 -0700 Subject: [PATCH 1/2] Revert Xcode 16 common build settings --- lib/xcodeproj/constants.rb | 74 +++---------------- .../OSX_Bundle/OSX_Bundle_base.xcconfig | 6 +- .../Objc_OSX_Framework_base.xcconfig | 7 +- .../Objc_OSX_Native_base.xcconfig | 5 +- .../Objc_iOS_Framework_base.xcconfig | 7 +- .../Objc_iOS_Native_base.xcconfig | 8 ++ .../Objc_iOS_Native_debug.xcconfig | 1 + .../Objc_iOS_Native_release.xcconfig | 2 + .../Objc_tvOS_Framework_base.xcconfig | 7 +- .../Objc_tvOS_Native_base.xcconfig | 8 +- .../Objc_watchOS_Framework_base.xcconfig | 8 +- ...bjc_watchOS_Native Extension_base.xcconfig | 9 +++ ...jc_watchOS_Native Extension_debug.xcconfig | 1 + ..._watchOS_Native Extension_release.xcconfig | 2 + .../Objc_watchOS_Native_base.xcconfig | 11 +-- .../configs/Project/Project_base.xcconfig | 8 +- .../configs/Project/Project_debug.xcconfig | 2 +- .../configs/Project/Project_release.xcconfig | 1 + .../Swift_OSX_Framework_base.xcconfig | 9 +-- .../Swift_OSX_Native_base.xcconfig | 5 +- .../Swift_iOS_Framework_base.xcconfig | 9 +-- .../Swift_iOS_Native_base.xcconfig | 9 +-- .../Swift_tvOS_Framework_base.xcconfig | 9 +-- .../Swift_tvOS_Native_base.xcconfig | 8 +- .../Swift_watchOS_Framework_base.xcconfig | 10 +-- ...ift_watchOS_Native Extension_base.xcconfig | 10 +++ ...ft_watchOS_Native Extension_debug.xcconfig | 1 + ..._watchOS_Native Extension_release.xcconfig | 2 + .../Swift_watchOS_Native_base.xcconfig | 12 +-- 29 files changed, 76 insertions(+), 175 deletions(-) create mode 100644 spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_base.xcconfig create mode 100644 spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_debug.xcconfig create mode 100644 spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_release.xcconfig create mode 100644 spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_base.xcconfig create mode 100644 spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_debug.xcconfig create mode 100644 spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_release.xcconfig create mode 100644 spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_base.xcconfig create mode 100644 spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_debug.xcconfig create mode 100644 spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_release.xcconfig diff --git a/lib/xcodeproj/constants.rb b/lib/xcodeproj/constants.rb index 89b777e60..f7e563f82 100644 --- a/lib/xcodeproj/constants.rb +++ b/lib/xcodeproj/constants.rb @@ -272,47 +272,22 @@ module Constants 'DYLIB_COMPATIBILITY_VERSION' => '1', 'DYLIB_CURRENT_VERSION' => '1', 'DYLIB_INSTALL_NAME_BASE' => '@rpath', - 'ENABLE_MODULE_VERIFIER' => 'YES', - 'GENERATE_INFOPLIST_FILE' => 'YES', 'INSTALL_PATH' => '$(LOCAL_LIBRARY_DIR)/Frameworks', - 'MARKETING_VERSION' => '1.0', - 'MODULE_VERIFIER_SUPPORTED_LANGUAGES' => 'objective-c objective-c++', - 'MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS' => 'gnu17 gnu++20', 'PRODUCT_NAME' => '$(TARGET_NAME:c99extidentifier)', 'SKIP_INSTALL' => 'YES', - 'SWIFT_EMIT_LOC_STRINGS' => 'YES', 'VERSION_INFO_PREFIX' => '', 'VERSIONING_SYSTEM' => 'apple-generic', }.freeze, [:ios, :framework] => { - 'ENABLE_MODULE_VERIFIER' => 'YES', - 'GENERATE_INFOPLIST_FILE' => 'YES', 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks @loader_path/Frameworks', - 'MARKETING_VERSION' => '1.0', 'TARGETED_DEVICE_FAMILY' => '1,2', - 'SWIFT_EMIT_LOC_STRINGS' => 'YES', }.freeze, [:osx, :framework] => { 'COMBINE_HIDPI_IMAGES' => 'YES', - 'ENABLE_MODULE_VERIFIER' => 'YES', 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/../Frameworks @loader_path/Frameworks', - 'SWIFT_EMIT_LOC_STRINGS' => 'YES', - }.freeze, - [:osx, :framework, :objc] => { - 'ENABLE_MODULE_VERIFIER' => 'YES', - 'GENERATE_INFOPLIST_FILE' => 'YES', - 'MARKETING_VERSION' => '1.0', - 'SWIFT_EMIT_LOC_STRINGS' => 'YES', - }.freeze, - [:osx, :framework, :swift] => { - 'ENABLE_MODULE_VERIFIER' => 'YES', - 'GENERATE_INFOPLIST_FILE' => 'YES', - 'MARKETING_VERSION' => '1.0', - 'MODULE_VERIFIER_SUPPORTED_LANGUAGES' => 'objective-c objective-c++', - 'MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS' => 'gnu17 gnu++20', - 'SWIFT_EMIT_LOC_STRINGS' => 'YES', }.freeze, [:watchos, :framework] => { + 'APPLICATION_EXTENSION_API_ONLY' => 'YES', 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks @loader_path/Frameworks', 'TARGETED_DEVICE_FAMILY' => '4', }.freeze, @@ -322,8 +297,6 @@ module Constants }.freeze, [:framework, :swift] => { 'DEFINES_MODULE' => 'YES', - 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES', - 'SWIFT_INSTALL_OBJC_HEADER' => 'NO', }.freeze, [:osx, :static_library] => { 'EXECUTABLE_PREFIX' => 'lib', @@ -353,47 +326,30 @@ module Constants [:application] => { 'ASSETCATALOG_COMPILER_APPICON_NAME' => 'AppIcon', 'ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME' => 'AccentColor', - 'CURRENT_PROJECT_VERSION' => '1', - 'GENERATE_INFOPLIST_FILE' => 'YES', - 'MARKETING_VERSION' => '1.0', - 'SWIFT_EMIT_LOC_STRINGS' => 'YES', }.freeze, [:ios, :application] => { 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks', 'TARGETED_DEVICE_FAMILY' => '1,2', }.freeze, - [:ios, :application, :swift] => { - 'INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents' => 'YES', - 'INFOPLIST_KEY_UIMainStoryboardFile' => 'Main', - 'INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad' => 'UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight', - 'INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone' => 'UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight', - }.freeze, [:osx, :application] => { 'COMBINE_HIDPI_IMAGES' => 'YES', - 'CURRENT_PROJECT_VERSION' => '1', - 'GENERATE_INFOPLIST_FILE' => 'YES', 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/../Frameworks', - 'MARKETING_VERSION' => '1.0', - 'SWIFT_EMIT_LOC_STRINGS' => 'YES', }.freeze, [:watchos, :application] => { - 'ENABLE_PREVIEWS' => 'YES', - 'INFOPLIST_KEY_UISupportedInterfaceOrientations' => 'UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown', - 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks', 'SKIP_INSTALL' => 'YES', 'TARGETED_DEVICE_FAMILY' => '4', }.freeze, [:tvos, :application] => { 'ASSETCATALOG_COMPILER_APPICON_NAME' => 'App Icon & Top Shelf Image', - 'INFOPLIST_KEY_UILaunchStoryboardName' => 'LaunchScreen', - 'INFOPLIST_KEY_UIMainStoryboardFile' => 'Main', - 'INFOPLIST_KEY_UIUserInterfaceStyle' => 'Automatic', 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks', 'TARGETED_DEVICE_FAMILY' => '3', }.freeze, [:tvos, :application, :swift] => { 'ENABLE_PREVIEWS' => 'YES', }.freeze, + [:watchos, :application, :swift] => { + 'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'YES', + }.freeze, [:bundle] => { 'WRAPPER_EXTENSION' => 'bundle', 'SKIP_INSTALL' => 'YES', @@ -402,14 +358,9 @@ module Constants 'SDKROOT' => 'iphoneos', }.freeze, [:osx, :bundle] => { - 'COMBINE_HIDPI_IMAGES' => 'YES', - 'CURRENT_PROJECT_VERSION' => '1', - 'GENERATE_INFOPLIST_FILE' => 'YES', - 'INFOPLIST_KEY_NSPrincipalClass' => '', - 'INSTALL_PATH' => '$(LOCAL_LIBRARY_DIR)/Bundles', - 'MARKETING_VERSION' => '1.0', - 'SDKROOT' => 'macosx', - 'SWIFT_EMIT_LOC_STRINGS' => 'YES', + 'COMBINE_HIDPI_IMAGES' => 'YES', + 'INSTALL_PATH' => '$(LOCAL_LIBRARY_DIR)/Bundles', + 'SDKROOT' => 'macosx', }.freeze, }.freeze @@ -418,10 +369,10 @@ module Constants PROJECT_DEFAULT_BUILD_SETTINGS = { :all => { 'ALWAYS_SEARCH_USER_PATHS' => 'NO', - 'ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS' => 'YES', 'CLANG_ANALYZER_NONNULL' => 'YES', 'CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION' => 'YES_AGGRESSIVE', - 'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++20', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++14', + 'CLANG_CXX_LIBRARY' => 'libc++', 'CLANG_ENABLE_MODULES' => 'YES', 'CLANG_ENABLE_OBJC_ARC' => 'YES', 'CLANG_ENABLE_OBJC_WEAK' => 'YES', @@ -449,8 +400,7 @@ module Constants 'CLANG_WARN_UNREACHABLE_CODE' => 'YES', 'COPY_PHASE_STRIP' => 'NO', 'ENABLE_STRICT_OBJC_MSGSEND' => 'YES', - 'ENABLE_USER_SCRIPT_SANDBOXING' => 'YES', - 'GCC_C_LANGUAGE_STANDARD' => 'gnu17', + 'GCC_C_LANGUAGE_STANDARD' => 'gnu11', 'GCC_NO_COMMON_BLOCKS' => 'YES', 'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES', 'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES_ERROR', @@ -458,7 +408,6 @@ module Constants 'GCC_WARN_UNINITIALIZED_AUTOS' => 'YES_AGGRESSIVE', 'GCC_WARN_UNUSED_FUNCTION' => 'YES', 'GCC_WARN_UNUSED_VARIABLE' => 'YES', - 'LOCALIZATION_PREFERS_STRING_CATALOGS' => 'YES', 'MTL_FAST_MATH' => 'YES', 'PRODUCT_NAME' => '$(TARGET_NAME)', 'SWIFT_VERSION' => '5.0', @@ -468,6 +417,7 @@ module Constants 'ENABLE_NS_ASSERTIONS' => 'NO', 'MTL_ENABLE_DEBUG_INFO' => 'NO', 'SWIFT_COMPILATION_MODE' => 'wholemodule', + 'SWIFT_OPTIMIZATION_LEVEL' => '-O', }.freeze, :debug => { 'DEBUG_INFORMATION_FORMAT' => 'dwarf', @@ -477,7 +427,7 @@ module Constants 'GCC_PREPROCESSOR_DEFINITIONS' => ['DEBUG=1', '$(inherited)'], 'MTL_ENABLE_DEBUG_INFO' => 'INCLUDE_SOURCE', 'ONLY_ACTIVE_ARCH' => 'YES', - 'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'DEBUG $(inherited)', + 'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'DEBUG', 'SWIFT_OPTIMIZATION_LEVEL' => '-Onone', }.freeze, }.freeze diff --git a/spec/fixtures/CommonBuildSettings/configs/OSX_Bundle/OSX_Bundle_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/OSX_Bundle/OSX_Bundle_base.xcconfig index 27e63a2e5..9c54a62a5 100644 --- a/spec/fixtures/CommonBuildSettings/configs/OSX_Bundle/OSX_Bundle_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/OSX_Bundle/OSX_Bundle_base.xcconfig @@ -1,12 +1,8 @@ COMBINE_HIDPI_IMAGES = YES -CURRENT_PROJECT_VERSION = 1 -GENERATE_INFOPLIST_FILE = YES -INFOPLIST_KEY_NSPrincipalClass = +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Bundles MACOSX_DEPLOYMENT_TARGET = ___BESTMACOSVERSION___ -MARKETING_VERSION = 1.0 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ SDKROOT = macosx SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES WRAPPER_EXTENSION = bundle diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Framework/Objc_OSX_Framework_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Framework/Objc_OSX_Framework_base.xcconfig index f77905ecb..e00609661 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Framework/Objc_OSX_Framework_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Framework/Objc_OSX_Framework_base.xcconfig @@ -4,18 +4,13 @@ DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_MODULE_VERIFIER = YES -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks MACOSX_DEPLOYMENT_TARGET = ___BESTMACOSVERSION___ -MARKETING_VERSION = 1.0 -MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++ -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) SDKROOT = macosx SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES VERSIONING_SYSTEM = apple-generic VERSION_INFO_PREFIX = diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Native/Objc_OSX_Native_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Native/Objc_OSX_Native_base.xcconfig index 668e9fdd7..c3b308891 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Native/Objc_OSX_Native_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Native/Objc_OSX_Native_base.xcconfig @@ -2,11 +2,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor CODE_SIGN_ENTITLEMENTS = ___PACKAGENAME___/___PACKAGENAMEASIDENTIFIER___.entitlements COMBINE_HIDPI_IMAGES = YES -CURRENT_PROJECT_VERSION = 1 -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks MACOSX_DEPLOYMENT_TARGET = ___BESTMACOSVERSION___ -MARKETING_VERSION = 1.0 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ SDKROOT = macosx -SWIFT_EMIT_LOC_STRINGS = YES diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Framework/Objc_iOS_Framework_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Framework/Objc_iOS_Framework_base.xcconfig index 8822e37e0..e81ac2b29 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Framework/Objc_iOS_Framework_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Framework/Objc_iOS_Framework_base.xcconfig @@ -3,19 +3,14 @@ DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_MODULE_VERIFIER = YES -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks IPHONEOS_DEPLOYMENT_TARGET = latest_iphoneos LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -MARKETING_VERSION = 1.0 -MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++ -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) SDKROOT = iphoneos SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 1,2 VERSIONING_SYSTEM = apple-generic VERSION_INFO_PREFIX = diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_base.xcconfig new file mode 100644 index 000000000..39c34904e --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_base.xcconfig @@ -0,0 +1,8 @@ +ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon +ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist +IPHONEOS_DEPLOYMENT_TARGET = latest_iphoneos +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks +PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ +SDKROOT = iphoneos +TARGETED_DEVICE_FAMILY = 1,2 diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_debug.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_debug.xcconfig new file mode 100644 index 000000000..6ed274f15 --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_debug.xcconfig @@ -0,0 +1 @@ +#include "Objc_iOS_Native/Objc_iOS_Native_base.xcconfig" diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_release.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_release.xcconfig new file mode 100644 index 000000000..73cdaba1c --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_release.xcconfig @@ -0,0 +1,2 @@ +#include "Objc_iOS_Native/Objc_iOS_Native_base.xcconfig" +VALIDATE_PRODUCT = YES diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Framework/Objc_tvOS_Framework_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Framework/Objc_tvOS_Framework_base.xcconfig index 66f289596..3b9a61525 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Framework/Objc_tvOS_Framework_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Framework/Objc_tvOS_Framework_base.xcconfig @@ -3,18 +3,13 @@ DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_MODULE_VERIFIER = YES -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -MARKETING_VERSION = 1.0 -MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++ -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) SDKROOT = appletvos SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 3 TVOS_DEPLOYMENT_TARGET = latest_appletvos VERSIONING_SYSTEM = apple-generic diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Native/Objc_tvOS_Native_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Native/Objc_tvOS_Native_base.xcconfig index a6fc0916d..4e9e6ece5 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Native/Objc_tvOS_Native_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Native/Objc_tvOS_Native_base.xcconfig @@ -1,14 +1,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = App Icon & Top Shelf Image ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor -CURRENT_PROJECT_VERSION = 1 -GENERATE_INFOPLIST_FILE = YES -INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen -INFOPLIST_KEY_UIMainStoryboardFile = Main -INFOPLIST_KEY_UIUserInterfaceStyle = Automatic +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks -MARKETING_VERSION = 1.0 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ SDKROOT = appletvos -SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 3 TVOS_DEPLOYMENT_TARGET = latest_appletvos diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Framework/Objc_watchOS_Framework_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Framework/Objc_watchOS_Framework_base.xcconfig index 35eac98d8..a0b438c5c 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Framework/Objc_watchOS_Framework_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Framework/Objc_watchOS_Framework_base.xcconfig @@ -1,20 +1,16 @@ +APPLICATION_EXTENSION_API_ONLY = YES CURRENT_PROJECT_VERSION = 1 DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_MODULE_VERIFIER = YES -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -MARKETING_VERSION = 1.0 -MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++ -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) SDKROOT = watchos SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 4 VERSIONING_SYSTEM = apple-generic VERSION_INFO_PREFIX = diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_base.xcconfig new file mode 100644 index 000000000..b0cb62c32 --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_base.xcconfig @@ -0,0 +1,9 @@ +ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks +PRODUCT_BUNDLE_IDENTIFIER = ___ASSOCIATEDTARGET_bundleIdentifier___.watchkitapp.watchkitextension +PRODUCT_NAME = ${TARGET_NAME} +SDKROOT = watchos +SKIP_INSTALL = YES +TARGETED_DEVICE_FAMILY = 4 +WATCHOS_DEPLOYMENT_TARGET = latest_watchos diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_debug.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_debug.xcconfig new file mode 100644 index 000000000..e40fa26f0 --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_debug.xcconfig @@ -0,0 +1 @@ +#include "Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_base.xcconfig" diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_release.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_release.xcconfig new file mode 100644 index 000000000..6441dde55 --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_release.xcconfig @@ -0,0 +1,2 @@ +#include "Objc_watchOS_Native Extension/Objc_watchOS_Native Extension_base.xcconfig" +VALIDATE_PRODUCT = YES diff --git a/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native/Objc_watchOS_Native_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native/Objc_watchOS_Native_base.xcconfig index 2e7a62850..2ff06f48d 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native/Objc_watchOS_Native_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Objc_watchOS_Native/Objc_watchOS_Native_base.xcconfig @@ -1,14 +1,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor -CURRENT_PROJECT_VERSION = 1 -ENABLE_PREVIEWS = YES -GENERATE_INFOPLIST_FILE = YES -INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks -MARKETING_VERSION = 1.0 -PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___VARIABLE_productName:RFC1034Identifier___.watchkitapp +IBSC_MODULE = ___PACKAGENAMEASIDENTIFIER____Extension +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = ___ASSOCIATEDTARGET_bundleIdentifier___.watchkitapp SDKROOT = watchos SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 4 WATCHOS_DEPLOYMENT_TARGET = latest_watchos diff --git a/spec/fixtures/CommonBuildSettings/configs/Project/Project_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Project/Project_base.xcconfig index 271c77524..4def93055 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Project/Project_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Project/Project_base.xcconfig @@ -1,8 +1,8 @@ ALWAYS_SEARCH_USER_PATHS = NO -ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES CLANG_ANALYZER_NONNULL = YES CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE -CLANG_CXX_LANGUAGE_STANDARD = gnu++20 +CLANG_CXX_LANGUAGE_STANDARD = gnu++14 +CLANG_CXX_LIBRARY = libc++ CLANG_ENABLE_MODULES = YES CLANG_ENABLE_OBJC_ARC = YES CLANG_ENABLE_OBJC_WEAK = YES @@ -30,8 +30,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES CLANG_WARN__DUPLICATE_METHOD_MATCH = YES COPY_PHASE_STRIP = NO ENABLE_STRICT_OBJC_MSGSEND = YES -ENABLE_USER_SCRIPT_SANDBOXING = YES -GCC_C_LANGUAGE_STANDARD = gnu17 +GCC_C_LANGUAGE_STANDARD = gnu11 GCC_NO_COMMON_BLOCKS = YES GCC_WARN_64_TO_32_BIT_CONVERSION = YES GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR @@ -39,7 +38,6 @@ GCC_WARN_UNDECLARED_SELECTOR = YES GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE GCC_WARN_UNUSED_FUNCTION = YES GCC_WARN_UNUSED_VARIABLE = YES -LOCALIZATION_PREFERS_STRING_CATALOGS = YES MTL_FAST_MATH = YES PRODUCT_NAME = $(TARGET_NAME) SWIFT_VERSION = 5.0 diff --git a/spec/fixtures/CommonBuildSettings/configs/Project/Project_debug.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Project/Project_debug.xcconfig index 5e668e97a..27bf4ad37 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Project/Project_debug.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Project/Project_debug.xcconfig @@ -6,5 +6,5 @@ GCC_OPTIMIZATION_LEVEL = 0 GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE ONLY_ACTIVE_ARCH = YES -SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG $(inherited) +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG SWIFT_OPTIMIZATION_LEVEL = -Onone diff --git a/spec/fixtures/CommonBuildSettings/configs/Project/Project_release.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Project/Project_release.xcconfig index 487bee2a1..3f4ba9725 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Project/Project_release.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Project/Project_release.xcconfig @@ -3,3 +3,4 @@ DEBUG_INFORMATION_FORMAT = dwarf-with-dsym ENABLE_NS_ASSERTIONS = NO MTL_ENABLE_DEBUG_INFO = NO SWIFT_COMPILATION_MODE = wholemodule +SWIFT_OPTIMIZATION_LEVEL = -O diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Framework/Swift_OSX_Framework_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Framework/Swift_OSX_Framework_base.xcconfig index a919949b5..e00609661 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Framework/Swift_OSX_Framework_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Framework/Swift_OSX_Framework_base.xcconfig @@ -1,23 +1,16 @@ -BUILD_LIBRARY_FOR_DISTRIBUTION = YES COMBINE_HIDPI_IMAGES = YES CURRENT_PROJECT_VERSION = 1 DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_MODULE_VERIFIER = YES -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks MACOSX_DEPLOYMENT_TARGET = ___BESTMACOSVERSION___ -MARKETING_VERSION = 1.0 -MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++ -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) SDKROOT = macosx SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES -SWIFT_INSTALL_OBJC_HEADER = NO VERSIONING_SYSTEM = apple-generic VERSION_INFO_PREFIX = diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Native/Swift_OSX_Native_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Native/Swift_OSX_Native_base.xcconfig index 668e9fdd7..c3b308891 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Native/Swift_OSX_Native_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Native/Swift_OSX_Native_base.xcconfig @@ -2,11 +2,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor CODE_SIGN_ENTITLEMENTS = ___PACKAGENAME___/___PACKAGENAMEASIDENTIFIER___.entitlements COMBINE_HIDPI_IMAGES = YES -CURRENT_PROJECT_VERSION = 1 -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks MACOSX_DEPLOYMENT_TARGET = ___BESTMACOSVERSION___ -MARKETING_VERSION = 1.0 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ SDKROOT = macosx -SWIFT_EMIT_LOC_STRINGS = YES diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Framework/Swift_iOS_Framework_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Framework/Swift_iOS_Framework_base.xcconfig index b28fb3845..e81ac2b29 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Framework/Swift_iOS_Framework_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Framework/Swift_iOS_Framework_base.xcconfig @@ -1,23 +1,16 @@ -BUILD_LIBRARY_FOR_DISTRIBUTION = YES CURRENT_PROJECT_VERSION = 1 DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_MODULE_VERIFIER = YES -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks IPHONEOS_DEPLOYMENT_TARGET = latest_iphoneos LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -MARKETING_VERSION = 1.0 -MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++ -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) SDKROOT = iphoneos SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES -SWIFT_INSTALL_OBJC_HEADER = NO TARGETED_DEVICE_FAMILY = 1,2 VERSIONING_SYSTEM = apple-generic VERSION_INFO_PREFIX = diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Native/Swift_iOS_Native_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Native/Swift_iOS_Native_base.xcconfig index deff21752..39c34904e 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Native/Swift_iOS_Native_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Native/Swift_iOS_Native_base.xcconfig @@ -1,15 +1,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor -CURRENT_PROJECT_VERSION = 1 -GENERATE_INFOPLIST_FILE = YES -INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES -INFOPLIST_KEY_UIMainStoryboardFile = Main -INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight -INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist IPHONEOS_DEPLOYMENT_TARGET = latest_iphoneos LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks -MARKETING_VERSION = 1.0 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ SDKROOT = iphoneos -SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 1,2 diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_tvOS_Framework/Swift_tvOS_Framework_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_tvOS_Framework/Swift_tvOS_Framework_base.xcconfig index 8ff0483e6..3b9a61525 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Swift_tvOS_Framework/Swift_tvOS_Framework_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_tvOS_Framework/Swift_tvOS_Framework_base.xcconfig @@ -1,22 +1,15 @@ -BUILD_LIBRARY_FOR_DISTRIBUTION = YES CURRENT_PROJECT_VERSION = 1 DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_MODULE_VERIFIER = YES -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -MARKETING_VERSION = 1.0 -MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++ -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) SDKROOT = appletvos SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES -SWIFT_INSTALL_OBJC_HEADER = NO TARGETED_DEVICE_FAMILY = 3 TVOS_DEPLOYMENT_TARGET = latest_appletvos VERSIONING_SYSTEM = apple-generic diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_tvOS_Native/Swift_tvOS_Native_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_tvOS_Native/Swift_tvOS_Native_base.xcconfig index 25c1d3656..6b02d1892 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Swift_tvOS_Native/Swift_tvOS_Native_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_tvOS_Native/Swift_tvOS_Native_base.xcconfig @@ -1,15 +1,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = App Icon & Top Shelf Image ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor -CURRENT_PROJECT_VERSION = 1 ENABLE_PREVIEWS = YES -GENERATE_INFOPLIST_FILE = YES -INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen -INFOPLIST_KEY_UIMainStoryboardFile = Main -INFOPLIST_KEY_UIUserInterfaceStyle = Automatic +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks -MARKETING_VERSION = 1.0 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ SDKROOT = appletvos -SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 3 TVOS_DEPLOYMENT_TARGET = latest_appletvos diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Framework/Swift_watchOS_Framework_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Framework/Swift_watchOS_Framework_base.xcconfig index c7571b2ab..a0b438c5c 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Framework/Swift_watchOS_Framework_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Framework/Swift_watchOS_Framework_base.xcconfig @@ -1,22 +1,16 @@ -BUILD_LIBRARY_FOR_DISTRIBUTION = YES +APPLICATION_EXTENSION_API_ONLY = YES CURRENT_PROJECT_VERSION = 1 DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_MODULE_VERIFIER = YES -GENERATE_INFOPLIST_FILE = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -MARKETING_VERSION = 1.0 -MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++ -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20 PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___ PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) SDKROOT = watchos SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES -SWIFT_INSTALL_OBJC_HEADER = NO TARGETED_DEVICE_FAMILY = 4 VERSIONING_SYSTEM = apple-generic VERSION_INFO_PREFIX = diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_base.xcconfig new file mode 100644 index 000000000..054d22e30 --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_base.xcconfig @@ -0,0 +1,10 @@ +ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication +ENABLE_PREVIEWS = YES +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks +PRODUCT_BUNDLE_IDENTIFIER = ___ASSOCIATEDTARGET_bundleIdentifier___.watchkitapp.watchkitextension +PRODUCT_NAME = ${TARGET_NAME} +SDKROOT = watchos +SKIP_INSTALL = YES +TARGETED_DEVICE_FAMILY = 4 +WATCHOS_DEPLOYMENT_TARGET = latest_watchos diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_debug.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_debug.xcconfig new file mode 100644 index 000000000..3b305a016 --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_debug.xcconfig @@ -0,0 +1 @@ +#include "Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_base.xcconfig" diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_release.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_release.xcconfig new file mode 100644 index 000000000..c9564f1e3 --- /dev/null +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_release.xcconfig @@ -0,0 +1,2 @@ +#include "Swift_watchOS_Native Extension/Swift_watchOS_Native Extension_base.xcconfig" +VALIDATE_PRODUCT = YES diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native/Swift_watchOS_Native_base.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native/Swift_watchOS_Native_base.xcconfig index 2e7a62850..31a322bf9 100644 --- a/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native/Swift_watchOS_Native_base.xcconfig +++ b/spec/fixtures/CommonBuildSettings/configs/Swift_watchOS_Native/Swift_watchOS_Native_base.xcconfig @@ -1,14 +1,10 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor -CURRENT_PROJECT_VERSION = 1 -ENABLE_PREVIEWS = YES -GENERATE_INFOPLIST_FILE = YES -INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks -MARKETING_VERSION = 1.0 -PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___VARIABLE_productName:RFC1034Identifier___.watchkitapp +IBSC_MODULE = ___PACKAGENAMEASIDENTIFIER____Extension +INFOPLIST_FILE = ___PACKAGENAME___/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = ___ASSOCIATEDTARGET_bundleIdentifier___.watchkitapp SDKROOT = watchos SKIP_INSTALL = YES -SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 4 WATCHOS_DEPLOYMENT_TARGET = latest_watchos From 02668e2caf4b898ad2c6f939b7e11dff054bdad8 Mon Sep 17 00:00:00 2001 From: Eric Amorde Date: Thu, 31 Oct 2024 10:03:30 -0700 Subject: [PATCH 2/2] Add CHANGELOG.md entry --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b628395b0..c1f717f15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,9 @@ ##### Bug Fixes -* None. +* Revert default build settings changes from https://github.com/CocoaPods/Xcodeproj/pull/987. + [Eric Amorde](https://github.com/amorde) + [#992](https://github.com/CocoaPods/Xcodeproj/pull/992) ## 1.26.0 (2024-10-27)