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

Update Cordova deps to latest #12518

Open
wants to merge 33 commits into
base: devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ef78f38
Update Cordova deps
StorytellerCZ Feb 21, 2023
cb00d80
Merge branch 'devel' into feature/cordova-deps-update-11
Grubba27 Apr 4, 2023
1296146
updating to support android 11
Grubba27 Apr 4, 2023
22039a0
new dockerfile in the ci
Grubba27 Apr 4, 2023
aab3b7f
updated name
Grubba27 Apr 4, 2023
d6e7067
updated the image
Grubba27 Apr 4, 2023
3ba6f35
Merge branch 'devel' into feature/cordova-deps-update-11
StorytellerCZ May 15, 2023
dc6df5b
Merge branch 'devel' into feature/cordova-deps-update-11
Grubba27 May 25, 2023
ec62066
Merge branch 'devel' into feature/cordova-deps-update-11
StorytellerCZ Jun 30, 2023
83d6a9c
Bump Cordova packages to v12
StorytellerCZ Jun 30, 2023
e630d69
Merge branch 'devel' into feature/cordova-deps-update-11
StorytellerCZ Aug 2, 2023
bc8f43e
Merge branch 'devel' into feature/cordova-deps-update-11
StorytellerCZ Aug 23, 2023
dc0ed26
Bump patch version of Cordova Android 12.0.1
StorytellerCZ Aug 29, 2023
ca695ca
Try fixing CircleCI for Cordova
StorytellerCZ Aug 29, 2023
9d09bad
See what is in our problem folder
StorytellerCZ Aug 29, 2023
eacfd91
Try to remove offending file on CircleCI
StorytellerCZ Aug 29, 2023
2ee965f
Another take on CircleCI
StorytellerCZ Aug 29, 2023
183653c
Try to fix failing test
StorytellerCZ Aug 30, 2023
6e605a6
Restore delete folder content step in CircleCI
StorytellerCZ Aug 30, 2023
a4a7777
Merge branch 'devel' into feature/cordova-deps-update-11
StorytellerCZ Sep 13, 2023
8a552d7
Trying @coachdan fix
StorytellerCZ Sep 13, 2023
3bb02f4
Revert "Trying @coachdan fix"
StorytellerCZ Sep 13, 2023
7e0b7b2
Merge branch 'devel' into feature/cordova-deps-update-11
Grubba27 Oct 19, 2023
5cf04ef
Update Docker image
StorytellerCZ Nov 16, 2023
0fa33a9
Merge branch 'devel' into feature/cordova-deps-update-11
StorytellerCZ Nov 16, 2023
f411f7b
Update config.yml
Grubba27 Nov 16, 2023
ebefb2a
Merge branch 'devel' into feature/cordova-deps-update-11
Grubba27 Nov 17, 2023
0f0cde7
Merge remote-tracking branch 'origin/release-2.14' into feature/cordo…
StorytellerCZ Nov 17, 2023
dab83a1
Sync CircleCI commands with current dev
StorytellerCZ Nov 17, 2023
de57443
Remove splash screen according to #12785
StorytellerCZ Nov 17, 2023
1443abc
Merge branch 'release-2.14' into feature/cordova-deps-update-11
StorytellerCZ Dec 4, 2023
23db1a6
Merge branch 'release-2.14' into feature/cordova-deps-update-11
StorytellerCZ Dec 4, 2023
46dc2c8
Merge branch 'devel' into feature/cordova-deps-update-11
StorytellerCZ Mar 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Expand Up @@ -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.
Expand Down
27 changes: 20 additions & 7 deletions tools/cordova/builder.js
Expand Up @@ -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(
Expand Down Expand Up @@ -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);
});
}

Expand Down
8 changes: 4 additions & 4 deletions tools/cordova/index.js
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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) =>
Expand Down