Merge pull request #37345 from m4gr3d/backport_kotlin_support

[3.2] Backport Kotlin support
godotengine · Mar 27, 2020 · e707b71 · e707b71
2 parents abb70a6 + 0c782ca
commit e707b71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle
@@ -15,6 +15,7 @@ buildscript {
     }
     dependencies {
         classpath libraries.androidGradlePlugin
+        classpath libraries.kotlinGradlePlugin
 //CHUNK_BUILDSCRIPT_DEPENDENCIES_BEGIN
 //CHUNK_BUILDSCRIPT_DEPENDENCIES_END
     }
@@ -34,6 +35,7 @@ allprojects {
 
 dependencies {
     implementation libraries.supportCoreUtils
+    implementation libraries.kotlinStdLib
     implementation libraries.v4Support
 
     if (rootProject.findProject(":lib")) {

diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle
@@ -5,13 +5,16 @@ ext.versions = [
     targetSdk          : 29,
     buildTools         : '29.0.1',
     supportCoreUtils   : '28.0.0',
+    kotlinVersion      : '1.3.61',
     v4Support          : '28.0.0'
 
 ]
 
 ext.libraries = [
     androidGradlePlugin: "com.android.tools.build:gradle:$versions.androidGradlePlugin",
     supportCoreUtils   : "com.android.support:support-core-utils:$versions.supportCoreUtils",
+    kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlinVersion",
+    kotlinStdLib       : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlinVersion",
     v4Support          : "com.android.support:support-v4:$versions.v4Support"
 ]
 

diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
@@ -9,6 +9,7 @@ buildscript {
     }
     dependencies {
         classpath libraries.androidGradlePlugin
+        classpath libraries.kotlinGradlePlugin
     }
 }
 

diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 dependencies {
     implementation libraries.supportCoreUtils
+    implementation libraries.kotlinStdLib
     implementation libraries.v4Support
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ buildscript { @@
         }
         dependencies {
             classpath libraries.androidGradlePlugin
+            classpath libraries.kotlinGradlePlugin
         }
     }
@@ Expand Down @@