This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-ios.git
The following commit(s) were added to refs/heads/master by this push:
new 59d0dd7 breaking: bump deployment-target to 11.0 (#779)
59d0dd7 is described below
commit 59d0dd712ff362e5165ce9a50f078425f83e637d
Author: エリス <[email protected]>
AuthorDate: Mon Feb 10 20:24:59 2020 +0900
breaking: bump deployment-target to 11.0 (#779)
---
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 4 ++--
.../project/__TEMP__.xcodeproj/project.pbxproj | 4 ++--
bin/templates/scripts/cordova/lib/Podfile.js | 4 ++--
.../CordovaLibTests.xcodeproj/project.pbxproj | 20 ++++++++++----------
.../CordovaLib/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 +-
.../launch-storyboard-support/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 7c449ba..093643f 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 7a27baf..d871035 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 e3ba690..db741e1 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 e9eeef3..cb84556 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 4adcabe..facc146 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 3b67dae..03aec24 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 84afac6..8fbe90f 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 2917aac..40c7af6 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 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
- <preference name="deployment-target" value="8.0" />
+ <preference name="deployment-target" value="11.0" />
<splash src="res/screen/ios/Default~iphone.png" width="320"
height="480"/>
<splash src="res/screen/ios/Default@2x~iphone.png" width="640"
height="960"/>
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 1bf60ae..113660e 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 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
- <preference name="deployment-target" value="8.0" />
+ <preference name="deployment-target" value="11.0" />
<splash src="res/screen/ios/Default~iphone.png" width="320"
height="480"/>
<splash src="res/screen/ios/Default@2x~iphone.png" width="640"
height="960"/>
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 5548897..d9ae88c 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 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
- <preference name="deployment-target" value="8.0" />
+ <preference name="deployment-target" value="11.0" />
<splash src="res/screen/ios/Default@2x~universal~anyany.png" />
<splash src="res/screen/ios/Default@2x~universal~comany.png" />
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 1dc7487..9f3f340 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 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
- <preference name="deployment-target" value="8.0" />
+ <preference name="deployment-target" value="11.0" />
</platform>
<access origin="http://*.apache.org"; />
diff --git a/tests/spec/unit/fixtures/test-config-2.xml
b/tests/spec/unit/fixtures/test-config-2.xml
index 1dc7487..9f3f340 100644
--- a/tests/spec/unit/fixtures/test-config-2.xml
+++ b/tests/spec/unit/fixtures/test-config-2.xml
@@ -12,7 +12,7 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
- <preference name="deployment-target" value="8.0" />
+ <preference name="deployment-target" value="11.0" />
</platform>
<access origin="http://*.apache.org"; />
diff --git a/tests/spec/unit/fixtures/test-config-3.xml
b/tests/spec/unit/fixtures/test-config-3.xml
index 9bea9d6..fda80c6 100644
--- a/tests/spec/unit/fixtures/test-config-3.xml
+++ b/tests/spec/unit/fixtures/test-config-3.xml
@@ -12,7 +12,7 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
- <preference name="deployment-target" value="8.0" />
+ <preference name="deployment-target" value="11.0" />
<preference name="SwiftVersion" value="4.1" />
</platform>
diff --git a/tests/spec/unit/prepare.spec.js b/tests/spec/unit/prepare.spec.js
index eaee026..535b480 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)', () => {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
