Skip to content

Commit

Permalink
Merge pull request #101 from /issues/100-cordova-android-13.0.0
Browse files Browse the repository at this point in the history
Update project for cordova-android 13.0.0
  • Loading branch information
TomasKypta committed Jul 1, 2024
2 parents ad126f8 + 4e388ca commit e1a4145
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ demoapp/platforms
demoapp/plugins
demoapp/.vscode/launch.json

# Gradle
.gradle

# artifacts
*.tgz

Expand All @@ -26,5 +29,4 @@ package
demoapp/.java-version

# sdkman

demoapp/.sdkmanrc
7 changes: 5 additions & 2 deletions demoapp/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
</platform>
<preference name="GradleVersion" value="7.6.2" />
<preference name="GradleVersion" value="8.1.1" />
<preference name="GradlePluginKotlinEnabled" value="false" />
<preference name="GradlePluginKotlinCodeStyle" value="official" />
<preference name="GradlePluginKotlinVersion" value="1.8.22" />
<preference name="AndroidGradlePluginVersion" value="7.4.2" />
<preference name="AndroidGradlePluginVersion" value="8.1.4" />
<preference name="AndroidXEnabled" value="true" />
<preference name="android-targetSdkVersion" value="34" />
<preference name="android-compileSdkVersion" value="34" />
<preference name="AndroidKotlinJVMTarget" value="17" />
<preference name="AndroidJavaSourceCompatibility" value="17" />
<preference name="AndroidJavaTargetCompatibility" value="17" />
</widget>
2 changes: 1 addition & 1 deletion demoapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions docs/Release-Notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Release 5.2.2-dev

- Update project for cordova-android 13.0.0 (#100)

## Previous Releases

Expand Down

0 comments on commit e1a4145

Please sign in to comment.