From b19bbadcf0b196914e355a96bc3b96dc75bfaa5b Mon Sep 17 00:00:00 2001
From: Marcel Admiraal <madmiraal@users.noreply.github.com>
Date: Tue, 31 May 2022 19:10:15 +0100
Subject: Ensure Android Java and Kotlin compile to the same version

---
 platform/android/java/editor/build.gradle | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'platform/android/java/editor')

diff --git a/platform/android/java/editor/build.gradle b/platform/android/java/editor/build.gradle
index 3312f61ad3..857c072e0c 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
@@ -29,6 +32,10 @@ android {
         targetCompatibility versions.javaVersion
     }
 
+    kotlinOptions {
+        jvmTarget = versions.javaVersion
+    }
+
     buildTypes {
         dev {
             initWith debug
-- 
cgit v1.2.3