diff options
| author | Fredia Huya-Kouadio <fhuya@meta.com> | 2023-12-21 00:13:16 -0800 |
|---|---|---|
| committer | Fredia Huya-Kouadio <fhuya@meta.com> | 2024-01-18 09:19:37 -0800 |
| commit | 85e98ef009c60efcb1ab298fcc79f782fe45dd41 (patch) | |
| tree | 51dedb2e1893fb76caa3a36fe6d69fb0bd454fd0 /platform/android/java | |
| parent | 9d1cbab1c432b6f1d66ec939445bec68b6af519e (diff) | |
| download | redot-engine-85e98ef009c60efcb1ab298fcc79f782fe45dd41.tar.gz | |
Specify the path to the Java SDK used for the Android gradle build
Introduce an editor setting to allow users the ability to specify the path to the Java SDK used for the Android gradle build.
Diffstat (limited to 'platform/android/java')
| -rw-r--r-- | platform/android/java/app/build.gradle | 9 | ||||
| -rw-r--r-- | platform/android/java/app/config.gradle | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index 01b148aeef..8a543a8550 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -241,3 +241,12 @@ task copyAndRenameReleaseAab(type: Copy) { into getExportPath() rename "build-release.aab", getExportFilename() } + +/** + * Used to validate the version of the Java SDK used for the Godot gradle builds. + */ +task validateJavaVersion { + if (JavaVersion.current() != versions.javaVersion) { + throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the required Java version for Godot gradle builds.") + } +} diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index a91e7bc7ce..bf091098b4 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -9,7 +9,7 @@ ext.versions = [ kotlinVersion : '1.7.0', fragmentVersion : '1.3.6', nexusPublishVersion: '1.1.0', - javaVersion : 17, + javaVersion : JavaVersion.VERSION_17, // Also update 'platform/android/detect.py#get_ndk_version()' when this is updated. ndkVersion : '23.2.8568313' |