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.

Sign up for GitHub

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

Jump to bottom

feat!: bump app template's default ios minimum to 14.0 #1427

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat!: bump app template's default ios minimum to 14.0 #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/Podfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function Podfile (podFilePath, projectName, minDeploymentTarget) {

this.path = podFilePath;
this.projectName = projectName;
this.minDeploymentTarget = minDeploymentTarget || '11.0';
this.minDeploymentTarget = minDeploymentTarget || '14.0';
this.contents = null;
this.sources = null;
this.declarations = null;
Expand Down Expand Up @@ -73,7 +73,7 @@ Podfile.prototype.__parseForDeclarations = function (text) {
// split by \n
const arr = text.split('\n');

// getting lines between "platform :ios, '11.0'"" and "target 'HelloCordova'" do
// getting lines between "platform :ios, '14.0'"" and "target 'HelloCordova'" do
const declarationsPreRE = /platform :ios,\s+'[^']+'/;
const declarationsPostRE = /target\s+'[^']+'\s+do/;
const declarationRE = /^\s*[^#]/;
Expand Down
4 changes: 2 additions & 2 deletions templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "__PROJECT_ID__";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -359,7 +359,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "__PROJECT_ID__";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
4 changes: 2 additions & 2 deletions tests/spec/unit/fixtures/ios-config-xml/SampleApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "SampleApp/SampleApp-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.example.friendstring;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -349,7 +349,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "SampleApp/SampleApp-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.example.friendstring;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/launch-storyboard-support/configs/legacy-only.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
<preference name="deployment-target" value="11.0" />
<preference name="deployment-target" value="14.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"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-and-legacy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
<preference name="deployment-target" value="11.0" />
<preference name="deployment-target" value="14.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"/>
Expand Down
3 changes: 1 addition & 2 deletions tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-only.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
<preference name="deployment-target" value="11.0" />
<preference name="deployment-target" value="14.0" />

<splash src="res/screen/ios/Default@2x~universal~anyany.png" />
<splash src="res/screen/ios/Default@2x~universal~comany.png" />
Expand All @@ -29,4 +29,3 @@
<allow-navigation href="https://*.apache.org" />

</widget>

2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/launch-storyboard-support/configs/none.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
<preference name="deployment-target" value="11.0" />
<preference name="deployment-target" value="14.0" />
</platform>

<access origin="http://*.apache.org" />
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/test-config-2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
<preference name="deployment-target" value="11.0" />
<preference name="deployment-target" value="14.0" />
</platform>

<access origin="http://*.apache.org" />
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/test-config-3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<platform name="ios">
<preference name="orientation" value="all" />
<preference name="target-device" value="handset" />
<preference name="deployment-target" value="11.0" />
<preference name="deployment-target" value="14.0" />
<preference name="SwiftVersion" value="4.1" />
</platform>

Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/prepare.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ describe('prepare', () => {
const proj = new XcodeProject(p.locations.pbxproj);
proj.parseSync();
const prop = proj.getBuildProperty('IPHONEOS_DEPLOYMENT_TARGET');
expect(prop).toEqual('11.0');
expect(prop).toEqual('14.0');
});
});
it('should write SwiftVersion preference (4.1)', () => {
Expand Down
Loading