From 3c3d8647ba61847eb7cf6105eba824402f796d7b Mon Sep 17 00:00:00 2001 From: Erisu Date: Fri, 7 Feb 2020 22:04:00 +0900 Subject: [PATCH] breaking: bump deployment-target to 11.0 --- .../CordovaLib.xcodeproj/project.pbxproj | 4 ++-- .../__TEMP__.xcodeproj/project.pbxproj | 4 ++-- bin/templates/scripts/cordova/lib/Podfile.js | 4 ++-- .../CordovaLibTests.xcodeproj/project.pbxproj | 20 +++++++++---------- .../CordovaLib.xcodeproj/project.pbxproj | 4 ++-- .../SampleApp.xcodeproj/project.orig.pbxproj | 4 ++-- .../SampleApp.xcodeproj/project.pbxproj | 4 ++-- .../configs/legacy-only.xml | 2 +- .../configs/modern-and-legacy.xml | 2 +- .../configs/modern-only.xml | 2 +- .../configs/none.xml | 2 +- tests/spec/unit/fixtures/test-config-2.xml | 2 +- tests/spec/unit/fixtures/test-config-3.xml | 2 +- tests/spec/unit/prepare.spec.js | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj index 7c449baea..093643f64 100644 --- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj +++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj @@ -621,7 +621,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -680,7 +680,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = "-ObjC"; diff --git a/bin/templates/project/__TEMP__.xcodeproj/project.pbxproj b/bin/templates/project/__TEMP__.xcodeproj/project.pbxproj index 7a27baf60..d87103558 100755 --- a/bin/templates/project/__TEMP__.xcodeproj/project.pbxproj +++ b/bin/templates/project/__TEMP__.xcodeproj/project.pbxproj @@ -320,7 +320,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "__PROJECT_ID__"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -343,7 +343,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "__PROJECT_ID__"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/bin/templates/scripts/cordova/lib/Podfile.js b/bin/templates/scripts/cordova/lib/Podfile.js index e3ba690ee..db741e13f 100644 --- a/bin/templates/scripts/cordova/lib/Podfile.js +++ b/bin/templates/scripts/cordova/lib/Podfile.js @@ -39,7 +39,7 @@ function Podfile (podFilePath, projectName, minDeploymentTarget) { this.path = podFilePath; this.projectName = projectName; - this.minDeploymentTarget = minDeploymentTarget || '10.0'; + this.minDeploymentTarget = minDeploymentTarget || '11.0'; this.contents = null; this.sources = null; this.declarations = null; @@ -75,7 +75,7 @@ Podfile.prototype.__parseForDeclarations = function (text) { // split by \n const arr = text.split('\n'); - // getting lines between "platform :ios, '10.0'"" and "target 'HelloCordova'" do + // getting lines between "platform :ios, '11.0'"" and "target 'HelloCordova'" do const declarationsPreRE = new RegExp('platform :ios,\\s+\'[^\']+\''); const declarationsPostRE = new RegExp('target\\s+\'[^\']+\'\\s+do'); const declarationRE = new RegExp('^\\s*[^#]'); diff --git a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj index e9eeef35b..cb8455682 100644 --- a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj +++ b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj @@ -527,7 +527,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DDEBUG"; @@ -566,7 +566,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( @@ -601,7 +601,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -624,7 +624,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -656,7 +656,7 @@ "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", ); INFOPLIST_FILE = "CordovaLibTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-all_load", @@ -687,7 +687,7 @@ "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", ); INFOPLIST_FILE = "CordovaLibTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-all_load", @@ -718,7 +718,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/CordovaLibApp/CordovaLibApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -742,7 +742,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/CordovaLibApp/CordovaLibApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; @@ -775,7 +775,7 @@ "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", ); INFOPLIST_FILE = "CordovaLibTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-all_load", @@ -806,7 +806,7 @@ "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", ); INFOPLIST_FILE = "CordovaLibTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-all_load", diff --git a/tests/spec/unit/fixtures/ios-config-xml/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/tests/spec/unit/fixtures/ios-config-xml/CordovaLib/CordovaLib.xcodeproj/project.pbxproj index 4adcabe7c..facc146ed 100644 --- a/tests/spec/unit/fixtures/ios-config-xml/CordovaLib/CordovaLib.xcodeproj/project.pbxproj +++ b/tests/spec/unit/fixtures/ios-config-xml/CordovaLib/CordovaLib.xcodeproj/project.pbxproj @@ -641,7 +641,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -700,7 +700,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = "-ObjC"; diff --git a/tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.orig.pbxproj b/tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.orig.pbxproj index 3b67daea5..03aec243a 100755 --- a/tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.orig.pbxproj +++ b/tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.orig.pbxproj @@ -302,7 +302,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "ChildApp/ChildApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; TARGETED_DEVICE_FAMILY = "1,2"; PRODUCT_NAME = "ChildApp"; @@ -324,7 +324,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "ChildApp/ChildApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; TARGETED_DEVICE_FAMILY = "1,2"; PRODUCT_NAME = "ChildApp"; diff --git a/tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.pbxproj b/tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.pbxproj index 84afac6c2..8fbe90f0b 100755 --- a/tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.pbxproj +++ b/tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.pbxproj @@ -322,7 +322,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "SampleApp/SampleApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.example.friendstring"; PRODUCT_NAME = "SampleApp"; @@ -345,7 +345,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "SampleApp/SampleApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.example.friendstring"; PRODUCT_NAME = "SampleApp"; diff --git a/tests/spec/unit/fixtures/launch-storyboard-support/configs/legacy-only.xml b/tests/spec/unit/fixtures/launch-storyboard-support/configs/legacy-only.xml index 2917aac2b..40c7af632 100644 --- a/tests/spec/unit/fixtures/launch-storyboard-support/configs/legacy-only.xml +++ b/tests/spec/unit/fixtures/launch-storyboard-support/configs/legacy-only.xml @@ -12,7 +12,7 @@ - + diff --git a/tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-and-legacy.xml b/tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-and-legacy.xml index 1bf60ae2e..113660e08 100644 --- a/tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-and-legacy.xml +++ b/tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-and-legacy.xml @@ -12,7 +12,7 @@ - + diff --git a/tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-only.xml b/tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-only.xml index 554889751..d9ae88c39 100644 --- a/tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-only.xml +++ b/tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-only.xml @@ -12,7 +12,7 @@ - + diff --git a/tests/spec/unit/fixtures/launch-storyboard-support/configs/none.xml b/tests/spec/unit/fixtures/launch-storyboard-support/configs/none.xml index 1dc748787..9f3f34020 100644 --- a/tests/spec/unit/fixtures/launch-storyboard-support/configs/none.xml +++ b/tests/spec/unit/fixtures/launch-storyboard-support/configs/none.xml @@ -12,7 +12,7 @@ - + diff --git a/tests/spec/unit/fixtures/test-config-2.xml b/tests/spec/unit/fixtures/test-config-2.xml index 1dc748787..9f3f34020 100644 --- a/tests/spec/unit/fixtures/test-config-2.xml +++ b/tests/spec/unit/fixtures/test-config-2.xml @@ -12,7 +12,7 @@ - + diff --git a/tests/spec/unit/fixtures/test-config-3.xml b/tests/spec/unit/fixtures/test-config-3.xml index 9bea9d6f3..fda80c6e0 100644 --- a/tests/spec/unit/fixtures/test-config-3.xml +++ b/tests/spec/unit/fixtures/test-config-3.xml @@ -12,7 +12,7 @@ - + diff --git a/tests/spec/unit/prepare.spec.js b/tests/spec/unit/prepare.spec.js index eaee026f9..535b480d6 100644 --- a/tests/spec/unit/prepare.spec.js +++ b/tests/spec/unit/prepare.spec.js @@ -599,7 +599,7 @@ describe('prepare', () => { const proj = new xcode.project(p.locations.pbxproj); /* eslint new-cap : 0 */ proj.parseSync(); const prop = proj.getBuildProperty('IPHONEOS_DEPLOYMENT_TARGET'); - expect(prop).toEqual('8.0'); + expect(prop).toEqual('11.0'); }); }); it('should write SwiftVersion preference (4.1)', () => {