diff --git a/.circleci/config.yml b/.circleci/config.yml index 4b7d3eef83c..56b933adb74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,8 +86,8 @@ build_machine_environment: &build_machine_environment # These will be evaled before each command. PRE_TEST_COMMANDS: |- - ulimit -c unlimited; # Set core dump size as Ubuntu 14.04 lacks prlimit. - ulimit -a # Display all ulimit settings for transparency. + ulimit -c unlimited; # Set core dump size as Ubuntu 14.04 lacks prlimit. + ulimit -a # Display all ulimit settings for transparency. # This is only to make Meteor self-test not remind us that we can set # this argument for self-tests. diff --git a/tools/cordova/builder.js b/tools/cordova/builder.js index 5a0860892ba..1d0239209b4 100644 --- a/tools/cordova/builder.js +++ b/tools/cordova/builder.js @@ -348,7 +348,14 @@ export class CordovaBuilder { files.writeFile(configXmlPath, formattedXmlConfig, 'utf8'); } - _copyImageToBuildFolderAndAppendToXmlNode(suppliedPath, newFilename, xmlElement, tag, attributes = {}) { + _copyImageToBuildFolderAndAppendToXmlNode(suppliedPath, newFilename, xmlElement, tag, attributes = {}, isIos = false) { + // will only change for the tag splash for preference in android. + const isAndroid = !isIos; + if (tag === 'splash' && isAndroid) { + return + Console.labelWarn('Android launch screens are no longer supported. Please use App.setPreference("AndroidWindowSplashScreenAnimatedIcon", "path/to/file", "android"). Visit https://cordova.apache.org/docs/en/latest/core/features/splashscreen/index.html#android-specific-information.') + } + const src = files.pathJoin('resources', newFilename); files.copyFile( @@ -422,21 +429,27 @@ export class CordovaBuilder { this._copyImageToBuildFolderAndAppendToXmlNode(suppliedPathDarkMode, appendDarkMode(value), xmlElement, - 'splash'); + 'splash', + {}, + isIos); } this._copyImageToBuildFolderAndAppendToXmlNode(suppliedPath, value, xmlElement, - 'splash'); + 'splash', + {}, + isIos); return; } const filename = this._resolveFilenameForImages(suppliedPath, key, 'splash'); + this._copyImageToBuildFolderAndAppendToXmlNode(suppliedPath, - filename, - xmlElement, - 'preference', - { name: value }); + filename, + xmlElement, + 'settings', + { name: value }, + isIos); }); } diff --git a/tools/cordova/index.js b/tools/cordova/index.js index df0025d3bd2..2b2f965ea18 100644 --- a/tools/cordova/index.js +++ b/tools/cordova/index.js @@ -16,9 +16,9 @@ export const CORDOVA_PLATFORMS = ['ios', 'android']; const CORDOVA_ANDROID_VERSION = "12.0.1"; export const CORDOVA_DEV_BUNDLE_VERSIONS = { - 'cordova-lib': '10.0.0', - 'cordova-common': '4.0.2', - 'cordova-create': '2.0.0', + 'cordova-lib': '12.0.1', + 'cordova-common': '5.0.0', + 'cordova-create': '5.0.0', 'cordova-registry-mapper': '1.1.15', 'cordova-android': CORDOVA_ANDROID_VERSION, }; @@ -70,7 +70,7 @@ export function ensureDevBundleDependencies() { export function displayNameForPlatform(platform) { return PLATFORM_TO_DISPLAY_NAME_MAP[platform] || platform; -}; +} export function displayNamesForPlatforms(platforms) { return platforms.map((platform) =>