asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #68497 from m4gr3d/upgrade_agp_main

Browse source 
Upgrade Android gradle plugin to version 7.2.1
This commit is contained in:
Rémi Verschelde 2022-11-11 10:23:13 +01:00 committed by GitHub
commit 90761a8df9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/android/java/app/config.gradle
View file

@ -1,10 +1,10 @@
ext.versions = [
androidGradlePlugin: '7.0.3',
androidGradlePlugin: '7.2.1',
compileSdk : 32,
minSdk : 19, // Also update 'platform/android/java/lib/AndroidManifest.xml#minSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
targetSdk : 32, // Also update 'platform/android/java/lib/AndroidManifest.xml#targetSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
minSdk : 19, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
targetSdk : 32, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
buildTools : '32.0.0',
kotlinVersion : '1.6.21',
kotlinVersion : '1.7.0',
fragmentVersion : '1.3.6',
nexusPublishVersion: '1.1.0',
javaVersion : 11,

2
platform/android/java/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

3
platform/android/java/lib/AndroidManifest.xml
View file

@ -4,9 +4,6 @@
android:versionCode="1"
android:versionName="1.0">
<!-- Should match the mindSdk and targetSdk values in platform/android/java/app/config.gradle -->
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="32" />
<application>
<!-- Records the version of the Godot library -->

13
platform/android/java/lib/build.gradle
View file

@ -176,11 +176,10 @@ android {
}
}
// TODO: Enable when issues with AGP 7.1+ are resolved (https://github.com/GodotVR/godot_openxr/issues/187).
// publishing {
// singleVariant("templateRelease") {
// withSourcesJar()
// withJavadocJar()
// }
// }
publishing {
singleVariant("templateRelease") {
withSourcesJar()
withJavadocJar()
}
}
}