Skip to content

Commit e08b951

Browse files
amordeamorde
authored
Merge pull request #992 from CocoaPods/amorde/revert-build-setting-changes
Revert Xcode 16 common build settings
2 parents a1d2206 + 02668e2 commit e08b951

30 files changed

+79
-176
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
##### Bug Fixes
1010

11-
* None.
11+
* Revert default build settings changes from https://github.com/CocoaPods/Xcodeproj/pull/987.
12+
[Eric Amorde](https://github.com/amorde)
13+
[#992](https://github.com/CocoaPods/Xcodeproj/pull/992)
1214

1315

1416
## 1.26.0 (2024-10-27)

‎lib/xcodeproj/constants.rb

Lines changed: 12 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -272,47 +272,22 @@ module Constants
272272
'DYLIB_COMPATIBILITY_VERSION' => '1',
273273
'DYLIB_CURRENT_VERSION' => '1',
274274
'DYLIB_INSTALL_NAME_BASE' => '@rpath',
275-
'ENABLE_MODULE_VERIFIER' => 'YES',
276-
'GENERATE_INFOPLIST_FILE' => 'YES',
277275
'INSTALL_PATH' => '$(LOCAL_LIBRARY_DIR)/Frameworks',
278-
'MARKETING_VERSION' => '1.0',
279-
'MODULE_VERIFIER_SUPPORTED_LANGUAGES' => 'objective-c objective-c++',
280-
'MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS' => 'gnu17 gnu++20',
281276
'PRODUCT_NAME' => '$(TARGET_NAME:c99extidentifier)',
282277
'SKIP_INSTALL' => 'YES',
283-
'SWIFT_EMIT_LOC_STRINGS' => 'YES',
284278
'VERSION_INFO_PREFIX' => '',
285279
'VERSIONING_SYSTEM' => 'apple-generic',
286280
}.freeze,
287281
[:ios, :framework] => {
288-
'ENABLE_MODULE_VERIFIER' => 'YES',
289-
'GENERATE_INFOPLIST_FILE' => 'YES',
290282
'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks @loader_path/Frameworks',
291-
'MARKETING_VERSION' => '1.0',
292283
'TARGETED_DEVICE_FAMILY' => '1,2',
293-
'SWIFT_EMIT_LOC_STRINGS' => 'YES',
294284
}.freeze,
295285
[:osx, :framework] => {
296286
'COMBINE_HIDPI_IMAGES' => 'YES',
297-
'ENABLE_MODULE_VERIFIER' => 'YES',
298287
'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/../Frameworks @loader_path/Frameworks',
299-
'SWIFT_EMIT_LOC_STRINGS' => 'YES',
300-
}.freeze,
301-
[:osx, :framework, :objc] => {
302-
'ENABLE_MODULE_VERIFIER' => 'YES',
303-
'GENERATE_INFOPLIST_FILE' => 'YES',
304-
'MARKETING_VERSION' => '1.0',
305-
'SWIFT_EMIT_LOC_STRINGS' => 'YES',
306-
}.freeze,
307-
[:osx, :framework, :swift] => {
308-
'ENABLE_MODULE_VERIFIER' => 'YES',
309-
'GENERATE_INFOPLIST_FILE' => 'YES',
310-
'MARKETING_VERSION' => '1.0',
311-
'MODULE_VERIFIER_SUPPORTED_LANGUAGES' => 'objective-c objective-c++',
312-
'MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS' => 'gnu17 gnu++20',
313-
'SWIFT_EMIT_LOC_STRINGS' => 'YES',
314288
}.freeze,
315289
[:watchos, :framework] => {
290+
'APPLICATION_EXTENSION_API_ONLY' => 'YES',
316291
'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks @loader_path/Frameworks',
317292
'TARGETED_DEVICE_FAMILY' => '4',
318293
}.freeze,
@@ -322,8 +297,6 @@ module Constants
322297
}.freeze,
323298
[:framework, :swift] => {
324299
'DEFINES_MODULE' => 'YES',
325-
'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES',
326-
'SWIFT_INSTALL_OBJC_HEADER' => 'NO',
327300
}.freeze,
328301
[:osx, :static_library] => {
329302
'EXECUTABLE_PREFIX' => 'lib',
@@ -353,47 +326,30 @@ module Constants
353326
[:application] => {
354327
'ASSETCATALOG_COMPILER_APPICON_NAME' => 'AppIcon',
355328
'ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME' => 'AccentColor',
356-
'CURRENT_PROJECT_VERSION' => '1',
357-
'GENERATE_INFOPLIST_FILE' => 'YES',
358-
'MARKETING_VERSION' => '1.0',
359-
'SWIFT_EMIT_LOC_STRINGS' => 'YES',
360329
}.freeze,
361330
[:ios, :application] => {
362331
'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks',
363332
'TARGETED_DEVICE_FAMILY' => '1,2',
364333
}.freeze,
365-
[:ios, :application, :swift] => {
366-
'INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents' => 'YES',
367-
'INFOPLIST_KEY_UIMainStoryboardFile' => 'Main',
368-
'INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad' => 'UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight',
369-
'INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone' => 'UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight',
370-
}.freeze,
371334
[:osx, :application] => {
372335
'COMBINE_HIDPI_IMAGES' => 'YES',
373-
'CURRENT_PROJECT_VERSION' => '1',
374-
'GENERATE_INFOPLIST_FILE' => 'YES',
375336
'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/../Frameworks',
376-
'MARKETING_VERSION' => '1.0',
377-
'SWIFT_EMIT_LOC_STRINGS' => 'YES',
378337
}.freeze,
379338
[:watchos, :application] => {
380-
'ENABLE_PREVIEWS' => 'YES',
381-
'INFOPLIST_KEY_UISupportedInterfaceOrientations' => 'UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown',
382-
'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks',
383339
'SKIP_INSTALL' => 'YES',
384340
'TARGETED_DEVICE_FAMILY' => '4',
385341
}.freeze,
386342
[:tvos, :application] => {
387343
'ASSETCATALOG_COMPILER_APPICON_NAME' => 'App Icon & Top Shelf Image',
388-
'INFOPLIST_KEY_UILaunchStoryboardName' => 'LaunchScreen',
389-
'INFOPLIST_KEY_UIMainStoryboardFile' => 'Main',
390-
'INFOPLIST_KEY_UIUserInterfaceStyle' => 'Automatic',
391344
'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) @executable_path/Frameworks',
392345
'TARGETED_DEVICE_FAMILY' => '3',
393346
}.freeze,
394347
[:tvos, :application, :swift] => {
395348
'ENABLE_PREVIEWS' => 'YES',
396349
}.freeze,
350+
[:watchos, :application, :swift] => {
351+
'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'YES',
352+
}.freeze,
397353
[:bundle] => {
398354
'WRAPPER_EXTENSION' => 'bundle',
399355
'SKIP_INSTALL' => 'YES',
@@ -402,14 +358,9 @@ module Constants
402358
'SDKROOT' => 'iphoneos',
403359
}.freeze,
404360
[:osx, :bundle] => {
405-
'COMBINE_HIDPI_IMAGES' => 'YES',
406-
'CURRENT_PROJECT_VERSION' => '1',
407-
'GENERATE_INFOPLIST_FILE' => 'YES',
408-
'INFOPLIST_KEY_NSPrincipalClass' => '',
409-
'INSTALL_PATH' => '$(LOCAL_LIBRARY_DIR)/Bundles',
410-
'MARKETING_VERSION' => '1.0',
411-
'SDKROOT' => 'macosx',
412-
'SWIFT_EMIT_LOC_STRINGS' => 'YES',
361+
'COMBINE_HIDPI_IMAGES' => 'YES',
362+
'INSTALL_PATH' => '$(LOCAL_LIBRARY_DIR)/Bundles',
363+
'SDKROOT' => 'macosx',
413364
}.freeze,
414365
}.freeze
415366

@@ -418,10 +369,10 @@ module Constants
418369
PROJECT_DEFAULT_BUILD_SETTINGS = {
419370
:all => {
420371
'ALWAYS_SEARCH_USER_PATHS' => 'NO',
421-
'ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS' => 'YES',
422372
'CLANG_ANALYZER_NONNULL' => 'YES',
423373
'CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION' => 'YES_AGGRESSIVE',
424-
'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++20',
374+
'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++14',
375+
'CLANG_CXX_LIBRARY' => 'libc++',
425376
'CLANG_ENABLE_MODULES' => 'YES',
426377
'CLANG_ENABLE_OBJC_ARC' => 'YES',
427378
'CLANG_ENABLE_OBJC_WEAK' => 'YES',
@@ -449,16 +400,14 @@ module Constants
449400
'CLANG_WARN_UNREACHABLE_CODE' => 'YES',
450401
'COPY_PHASE_STRIP' => 'NO',
451402
'ENABLE_STRICT_OBJC_MSGSEND' => 'YES',
452-
'ENABLE_USER_SCRIPT_SANDBOXING' => 'YES',
453-
'GCC_C_LANGUAGE_STANDARD' => 'gnu17',
403+
'GCC_C_LANGUAGE_STANDARD' => 'gnu11',
454404
'GCC_NO_COMMON_BLOCKS' => 'YES',
455405
'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES',
456406
'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES_ERROR',
457407
'GCC_WARN_UNDECLARED_SELECTOR' => 'YES',
458408
'GCC_WARN_UNINITIALIZED_AUTOS' => 'YES_AGGRESSIVE',
459409
'GCC_WARN_UNUSED_FUNCTION' => 'YES',
460410
'GCC_WARN_UNUSED_VARIABLE' => 'YES',
461-
'LOCALIZATION_PREFERS_STRING_CATALOGS' => 'YES',
462411
'MTL_FAST_MATH' => 'YES',
463412
'PRODUCT_NAME' => '$(TARGET_NAME)',
464413
'SWIFT_VERSION' => '5.0',
@@ -468,6 +417,7 @@ module Constants
468417
'ENABLE_NS_ASSERTIONS' => 'NO',
469418
'MTL_ENABLE_DEBUG_INFO' => 'NO',
470419
'SWIFT_COMPILATION_MODE' => 'wholemodule',
420+
'SWIFT_OPTIMIZATION_LEVEL' => '-O',
471421
}.freeze,
472422
:debug => {
473423
'DEBUG_INFORMATION_FORMAT' => 'dwarf',
@@ -477,7 +427,7 @@ module Constants
477427
'GCC_PREPROCESSOR_DEFINITIONS' => ['DEBUG=1', '$(inherited)'],
478428
'MTL_ENABLE_DEBUG_INFO' => 'INCLUDE_SOURCE',
479429
'ONLY_ACTIVE_ARCH' => 'YES',
480-
'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'DEBUG $(inherited)',
430+
'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'DEBUG',
481431
'SWIFT_OPTIMIZATION_LEVEL' => '-Onone',
482432
}.freeze,
483433
}.freeze

‎spec/fixtures/CommonBuildSettings/configs/OSX_Bundle/OSX_Bundle_base.xcconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
COMBINE_HIDPI_IMAGES = YES
2-
CURRENT_PROJECT_VERSION = 1
3-
GENERATE_INFOPLIST_FILE = YES
4-
INFOPLIST_KEY_NSPrincipalClass =
2+
INFOPLIST_FILE = ___PACKAGENAME___/Info.plist
53
INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Bundles
64
MACOSX_DEPLOYMENT_TARGET = ___BESTMACOSVERSION___
7-
MARKETING_VERSION = 1.0
85
PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___
96
SDKROOT = macosx
107
SKIP_INSTALL = YES
11-
SWIFT_EMIT_LOC_STRINGS = YES
128
WRAPPER_EXTENSION = bundle

‎spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Framework/Objc_OSX_Framework_base.xcconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@ DEFINES_MODULE = YES
44
DYLIB_COMPATIBILITY_VERSION = 1
55
DYLIB_CURRENT_VERSION = 1
66
DYLIB_INSTALL_NAME_BASE = @rpath
7-
ENABLE_MODULE_VERIFIER = YES
8-
GENERATE_INFOPLIST_FILE = YES
7+
INFOPLIST_FILE = ___PACKAGENAME___/Info.plist
98
INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
109
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks
1110
MACOSX_DEPLOYMENT_TARGET = ___BESTMACOSVERSION___
12-
MARKETING_VERSION = 1.0
13-
MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++
14-
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20
1511
PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___
1612
PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
1713
SDKROOT = macosx
1814
SKIP_INSTALL = YES
19-
SWIFT_EMIT_LOC_STRINGS = YES
2015
VERSIONING_SYSTEM = apple-generic
2116
VERSION_INFO_PREFIX =

‎spec/fixtures/CommonBuildSettings/configs/Objc_OSX_Native/Objc_OSX_Native_base.xcconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
22
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor
33
CODE_SIGN_ENTITLEMENTS = ___PACKAGENAME___/___PACKAGENAMEASIDENTIFIER___.entitlements
44
COMBINE_HIDPI_IMAGES = YES
5-
CURRENT_PROJECT_VERSION = 1
6-
GENERATE_INFOPLIST_FILE = YES
5+
INFOPLIST_FILE = ___PACKAGENAME___/Info.plist
76
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks
87
MACOSX_DEPLOYMENT_TARGET = ___BESTMACOSVERSION___
9-
MARKETING_VERSION = 1.0
108
PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___
119
SDKROOT = macosx
12-
SWIFT_EMIT_LOC_STRINGS = YES

‎spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Framework/Objc_iOS_Framework_base.xcconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@ DEFINES_MODULE = YES
33
DYLIB_COMPATIBILITY_VERSION = 1
44
DYLIB_CURRENT_VERSION = 1
55
DYLIB_INSTALL_NAME_BASE = @rpath
6-
ENABLE_MODULE_VERIFIER = YES
7-
GENERATE_INFOPLIST_FILE = YES
6+
INFOPLIST_FILE = ___PACKAGENAME___/Info.plist
87
INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
98
IPHONEOS_DEPLOYMENT_TARGET = latest_iphoneos
109
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
11-
MARKETING_VERSION = 1.0
12-
MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++
13-
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20
1410
PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___
1511
PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
1612
SDKROOT = iphoneos
1713
SKIP_INSTALL = YES
18-
SWIFT_EMIT_LOC_STRINGS = YES
1914
TARGETED_DEVICE_FAMILY = 1,2
2015
VERSIONING_SYSTEM = apple-generic
2116
VERSION_INFO_PREFIX =

‎spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_base.xcconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
2+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor
3+
INFOPLIST_FILE = ___PACKAGENAME___/Info.plist
4+
IPHONEOS_DEPLOYMENT_TARGET = latest_iphoneos
5+
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
6+
PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___
7+
SDKROOT = iphoneos
8+
TARGETED_DEVICE_FAMILY = 1,2

‎spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_debug.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "Objc_iOS_Native/Objc_iOS_Native_base.xcconfig"

‎spec/fixtures/CommonBuildSettings/configs/Objc_iOS_Native/Objc_iOS_Native_release.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "Objc_iOS_Native/Objc_iOS_Native_base.xcconfig"
2+
VALIDATE_PRODUCT = YES

‎spec/fixtures/CommonBuildSettings/configs/Objc_tvOS_Framework/Objc_tvOS_Framework_base.xcconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ DEFINES_MODULE = YES
33
DYLIB_COMPATIBILITY_VERSION = 1
44
DYLIB_CURRENT_VERSION = 1
55
DYLIB_INSTALL_NAME_BASE = @rpath
6-
ENABLE_MODULE_VERIFIER = YES
7-
GENERATE_INFOPLIST_FILE = YES
6+
INFOPLIST_FILE = ___PACKAGENAME___/Info.plist
87
INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
98
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
10-
MARKETING_VERSION = 1.0
11-
MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++
12-
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu17 gnu++20
139
PRODUCT_BUNDLE_IDENTIFIER = ___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___.___PACKAGENAMEASRFC1034IDENTIFIER___
1410
PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
1511
SDKROOT = appletvos
1612
SKIP_INSTALL = YES
17-
SWIFT_EMIT_LOC_STRINGS = YES
1813
TARGETED_DEVICE_FAMILY = 3
1914
TVOS_DEPLOYMENT_TARGET = latest_appletvos
2015
VERSIONING_SYSTEM = apple-generic

0 commit comments

Comments
 (0)