diff --git a/Podfile b/Podfile index 7624efdd1106..c6126c94f520 100644 --- a/Podfile +++ b/Podfile @@ -106,12 +106,16 @@ end post_install do |installer| gutenberg_post_install(installer: installer) - # Fix a code signing issue in Xcode 14 beta. - # This solution is suggested here: https://github.com/CocoaPods/CocoaPods/issues/11402#issuecomment-1189861270 - # ==================================== installer.pods_project.targets.each do |target| target.build_configurations.each do |config| + # Fix a code signing issue in Xcode 14 beta. + # This solution is suggested here: https://github.com/CocoaPods/CocoaPods/issues/11402#issuecomment-1189861270 config.build_settings['CODE_SIGN_IDENTITY'] = '' + + # Let Pods targets inherit deployment target from the app + # This solution is suggested here: https://github.com/CocoaPods/CocoaPods/issues/4859 + pod_ios_deployment_target = Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']) + config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' if pod_ios_deployment_target <= APP_IOS_DEPLOYMENT_TARGET end end diff --git a/Podfile.lock b/Podfile.lock index 86e83c4e8d07..0b3361354458 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -27,6 +27,6 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1 WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c -PODFILE CHECKSUM: f30ae9db730f660b2c300f7761c19ab78f244d90 +PODFILE CHECKSUM: 5929f96fe170623f0e4abff76bffc6ce69432409 COCOAPODS: 1.15.2 diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index dd6616dbeea4..a943a6248ce2 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -27084,7 +27084,6 @@ ); INFOPLIST_FILE = Info.plist; INFOPLIST_PREPROCESS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; JP_SCHEME = jpdebug; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -27153,7 +27152,6 @@ ); INFOPLIST_FILE = Info.plist; INFOPLIST_PREPROCESS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; JP_SCHEME = jetpack; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -29148,7 +29146,6 @@ ); INFOPLIST_FILE = "WordPress-Alpha-Info.plist"; INFOPLIST_PREPROCESS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; JP_SCHEME = jpalpha; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -29592,7 +29589,6 @@ ); INFOPLIST_FILE = "WordPress-Internal-Info.plist"; INFOPLIST_PREPROCESS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; JP_SCHEME = jpinternal; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)",