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

Cordova 7.1.0, Android 6.3.0 and iOS 4.5.3 updates #9213

Merged
merged 14 commits into from Nov 8, 2017
Merged
10 changes: 10 additions & 0 deletions History.md
@@ -1,5 +1,15 @@
## v.NEXT

* [`cordova-lib`](https://github.com/apache/cordova-cli) has been updated to
version 7.1.0, [`cordova-android`](https://github.com/apache/cordova-android/)
has been updated to version 6.3.0, and [`cordova-ios`](https://github.com/apache/cordova-ios/)
has been updated to version 4.5.3. The cordova-plugins `cordova-plugin-console`,
`cordova-plugin-device-motion`, and `cordova-plugin-device-orientation` have been
[deprecated](https://cordova.apache.org/news/2017/09/22/plugins-release.html)
and will likely be removed in a future Meteor release.
[Feature Request #196](https://github.com/meteor/meteor-feature-requests/issues/196)
[PR #9213](https://github.com/meteor/meteor/pull/9213)

* iOS icons and launch screens have been updated to support iOS 11
[Issue #9196](https://github.com/meteor/meteor/issues/9196)
[PR #9198](https://github.com/meteor/meteor/pull/9198)
Expand Down
2 changes: 1 addition & 1 deletion packages/logging/package.js
Expand Up @@ -12,7 +12,7 @@ Npm.strip({
});

Cordova.depends({
'cordova-plugin-console': '1.0.7'
'cordova-plugin-console': '1.1.0' // Dreprecated, remove in future
});

Package.onUse(function (api) {
Expand Down
1 change: 1 addition & 0 deletions scripts/dev-bundle-tool-package.js
Expand Up @@ -52,6 +52,7 @@ var packageJson = {
pathwatcher: "7.1.0",
optimism: "0.3.3",
'lru-cache': '4.0.1',
'cordova-lib': "7.1.0",
longjohn: '0.2.12'
}
};
Expand Down
15 changes: 7 additions & 8 deletions tools/cordova/builder.js
Expand Up @@ -55,11 +55,13 @@ const launchIosSizes = {
'iphoneX_landscape': '2436x1125',
'ipad_portrait_2x': '1536x2048',
'ipad_landscape_2x': '2048x1536',
'ipad_portrait_pro_10_5': '1668x2224',
'ipad_landscape_pro_10_5': '2224x1668',
'ipad_portrait_pro_12_9': '2048x2732',
'ipad_landscape_pro_12_9': '2732x2048',
// Not yet supported in Xcode 9 or Cordova iOS 4.5.3
// 'ipad_portrait_pro_10_5': '1668x2224',
// 'ipad_landscape_pro_10_5': '2224x1668',
// 'ipad_portrait_pro_12_9': '2048x2732',
// 'ipad_landscape_pro_12_9': '2732x2048',
// Legacy
'iphone': '320x480',
'iphone_2x': '640x960',
'ipad_portrait': '768x1024',
'ipad_landscape': '1024x768'
Expand Down Expand Up @@ -603,10 +605,7 @@ configuration. The key may be deprecated.`);
* - `iphoneX_landscape` (2436x1125) // iPhone X
* - `ipad_portrait_2x` (1536x2048) // iPad, iPad mini
* - `ipad_landscape_2x` (2048x1536) // iPad, iPad mini
* - `ipad_portrait_pro_10_5` (1668x2224) // iPad Pro 10.5"
* - `ipad_landscape_pro_10_5` (2224x1668) // iPad Pro 10.5"
* - `ipad_portrait_pro_12_9` (2048x2732) // iPad Pro 12.9"
* - `ipad_landscape_pro_12_9` (2732x2048) // iPad Pro 12.9"
* - `iphone` (320x480) // Legacy
* - `iphone_2x` (640x960) // Legacy
* - `ipad_portrait` (768x1024) // Legacy
* - `ipad_landscape` (1024x768) // Legacy
Expand Down
4 changes: 2 additions & 2 deletions tools/cordova/index.js
Expand Up @@ -14,8 +14,8 @@ export const CORDOVA_DEV_BUNDLE_VERSIONS = {
};

export const CORDOVA_PLATFORM_VERSIONS = {
'android': '6.2.3',
'ios': '4.5.1'
'android': '6.3.0',
'ios': '4.5.3'
};

const PLATFORM_TO_DISPLAY_NAME_MAP = {
Expand Down
6 changes: 3 additions & 3 deletions tools/cordova/project.js
Expand Up @@ -53,11 +53,11 @@ const pinnedPlatformVersions = CORDOVA_PLATFORM_VERSIONS;
const pinnedPluginVersions = {
"cordova-plugin-battery-status": "1.2.4",
"cordova-plugin-camera": "2.4.1",
"cordova-plugin-console": "1.0.7",
"cordova-plugin-console": "1.1.0", // Deprecated, remove in future
"cordova-plugin-contacts": "2.3.1",
"cordova-plugin-device": "1.1.6",
"cordova-plugin-device-motion": "1.2.5",
"cordova-plugin-device-orientation": "1.0.7",
"cordova-plugin-device-motion": "2.0.0", // Deprecated, remove in future
"cordova-plugin-device-orientation": "2.0.0", // Deprecated, remove in future
"cordova-plugin-dialogs": "1.3.3",
"cordova-plugin-file": "4.3.3",
"cordova-plugin-file-transfer": "1.6.3",
Expand Down