From c51cc0638aa9abae27d9f729f6a349fd313e6070 Mon Sep 17 00:00:00 2001 From: Tomas Kypta Date: Thu, 27 Jun 2024 19:02:42 +0200 Subject: [PATCH 1/3] Update demo app for cordova-android 13.0.0 --- .gitignore | 4 +++- demoapp/config.xml | 7 +++++-- demoapp/package.json | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7abf8f2..e611828 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,9 @@ demoapp/platforms demoapp/plugins demoapp/.vscode/launch.json +# Gradle +.gradle + # artifacts *.tgz @@ -26,5 +29,4 @@ package demoapp/.java-version # sdkman - demoapp/.sdkmanrc diff --git a/demoapp/config.xml b/demoapp/config.xml index 1047ee2..bb7ec5e 100644 --- a/demoapp/config.xml +++ b/demoapp/config.xml @@ -22,12 +22,15 @@ - + - + + + + diff --git a/demoapp/package.json b/demoapp/package.json index b942aef..a6a490c 100644 --- a/demoapp/package.json +++ b/demoapp/package.json @@ -12,7 +12,7 @@ "reinstallAndPreparePlugin": "( npm run uninstallPlugin || true ) && npm run preparePlugin && npm run installPlugin", "reinstallPlugin": "( npm run uninstallPlugin || true ) && npm run installPlugin", "prepareConfig": "node ./malwarelytics.xml.patch.js", - "addAndroid": "cordova platform add android@12.0.1", + "addAndroid": "cordova platform add android@13.0.0", "removeAndroid": "cordova platform rm android", "prepareAndroid": "npm run addAndroid || ( npm run removeAndroid && npm run addAndroid )", "buildAndroid": "tsc && cordova build android", From 8471b57facdae5f8002aefc89142d36333581ec5 Mon Sep 17 00:00:00 2001 From: Tomas Kypta Date: Thu, 27 Jun 2024 19:04:11 +0200 Subject: [PATCH 2/3] Update release notes --- docs/Release-Notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Release-Notes.md b/docs/Release-Notes.md index da031b6..6c18223 100644 --- a/docs/Release-Notes.md +++ b/docs/Release-Notes.md @@ -4,6 +4,7 @@ ### Release 5.2.2-dev +- Update project for cordova-android 13.0.0 (#100) ## Previous Releases From 4e388cac34e64dac7e706649564c247f0e360345 Mon Sep 17 00:00:00 2001 From: Tomas Kypta Date: Thu, 27 Jun 2024 21:21:37 +0200 Subject: [PATCH 3/3] Update to Java 17 in GitHub action --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bffe0d6..7c2207a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,11 +20,11 @@ jobs: steps: - name: Checkout the repo uses: actions/checkout@v4 - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'gradle' - name: Setup Cordova tools run: npm install -g cordova