summaryrefslogtreecommitdiff
path: root/platform/android/java/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-06-01 18:31:09 +0200
committerGitHub <noreply@github.com>2022-06-01 18:31:09 +0200
commitcd7871867faae0d1aa4c2bf5cd6dae8ea8f4237c (patch)
tree3c598fd26e3f86994fcf592e173576bd9eeef962 /platform/android/java/editor
parent79aa13ac7ed65c6fed47509e50e328db219bb5b8 (diff)
parentb19bbadcf0b196914e355a96bc3b96dc75bfaa5b (diff)
Merge pull request #61579 from madmiraal/android-kotlin-java-version
Ensure Android Java and Kotlin compile to the same version
Diffstat (limited to 'platform/android/java/editor')
-rw-r--r--platform/android/java/editor/build.gradle9
1 files changed, 8 insertions, 1 deletions
diff --git a/platform/android/java/editor/build.gradle b/platform/android/java/editor/build.gradle
index 940ae67073..dd167c3880 100644
--- a/platform/android/java/editor/build.gradle
+++ b/platform/android/java/editor/build.gradle
@@ -1,5 +1,8 @@
// Gradle build config for Godot Engine's Android port.
-apply plugin: 'com.android.application'
+plugins {
+ id 'com.android.application'
+ id 'org.jetbrains.kotlin.android'
+}
dependencies {
implementation libraries.kotlinStdLib
@@ -31,6 +34,10 @@ android {
targetCompatibility versions.javaVersion
}
+ kotlinOptions {
+ jvmTarget = versions.javaVersion
+ }
+
buildTypes {
dev {
initWith debug