Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

breaking: bump deployment-target to 11.0 #779

Merged
merged 1 commit into from
Feb 10, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CordovaLib/CordovaLib.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -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";
4 changes: 2 additions & 2 deletions bin/templates/project/__TEMP__.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -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)";
4 changes: 2 additions & 2 deletions bin/templates/scripts/cordova/lib/Podfile.js
Original file line number Diff line number Diff line change
@@ -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*[^#]');
20 changes: 10 additions & 10 deletions tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -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",
Original file line number Diff line number Diff line change
@@ -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";
Original file line number Diff line number Diff line change
@@ -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";
Original file line number Diff line number Diff line change
@@ -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";
Original file line number Diff line number Diff line change
@@ -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"/>
Original file line number Diff line number Diff line change
@@ -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"/>
Original file line number Diff line number Diff line change
@@ -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" />
Original file line number Diff line number Diff line change
@@ -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" />
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/test-config-2.xml
Original file line number Diff line number Diff line change
@@ -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" />
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/test-config-3.xml
Original file line number Diff line number Diff line change
@@ -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>

2 changes: 1 addition & 1 deletion tests/spec/unit/prepare.spec.js
Original file line number Diff line number Diff line change
@@ -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)', () => {