godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37345 from m4gr3d/backport_kotlin_support 

[3.2] Backport Kotlin support
This commit is contained in:
Rémi Verschelde 2020-03-27 22:10:32 +01:00 committed by GitHub
parent abb70a6165 0c782ca2b2
commit e707b712e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/java/app/build.gradle
View File

@ -15,6 +15,7 @@ buildscript {
} }
dependencies { dependencies {
classpath libraries.androidGradlePlugin classpath libraries.androidGradlePlugin
classpath libraries.kotlinGradlePlugin
//CHUNK_BUILDSCRIPT_DEPENDENCIES_BEGIN //CHUNK_BUILDSCRIPT_DEPENDENCIES_BEGIN
//CHUNK_BUILDSCRIPT_DEPENDENCIES_END //CHUNK_BUILDSCRIPT_DEPENDENCIES_END
} }
@ -34,6 +35,7 @@ allprojects {
dependencies { dependencies {
implementation libraries.supportCoreUtils implementation libraries.supportCoreUtils
implementation libraries.kotlinStdLib
implementation libraries.v4Support implementation libraries.v4Support
if (rootProject.findProject(":lib")) { if (rootProject.findProject(":lib")) {

3
platform/android/java/app/config.gradle
View File

@ -5,6 +5,7 @@ ext.versions = [
targetSdk : 29, targetSdk : 29,
buildTools : '29.0.1', buildTools : '29.0.1',
supportCoreUtils : '28.0.0', supportCoreUtils : '28.0.0',
kotlinVersion : '1.3.61',
v4Support : '28.0.0' v4Support : '28.0.0'
] ]
@ -12,6 +13,8 @@ ext.versions = [
ext.libraries = [ ext.libraries = [
androidGradlePlugin: "com.android.tools.build:gradle:$versions.androidGradlePlugin", androidGradlePlugin: "com.android.tools.build:gradle:$versions.androidGradlePlugin",
supportCoreUtils : "com.android.support:support-core-utils:$versions.supportCoreUtils", 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" v4Support : "com.android.support:support-v4:$versions.v4Support"
] ]

1
platform/android/java/build.gradle
View File

@ -9,6 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath libraries.androidGradlePlugin classpath libraries.androidGradlePlugin
classpath libraries.kotlinGradlePlugin
} }
} }

2
platform/android/java/lib/build.gradle
View File

@ -1,7 +1,9 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
dependencies { dependencies {
implementation libraries.supportCoreUtils implementation libraries.supportCoreUtils
implementation libraries.kotlinStdLib
implementation libraries.v4Support implementation libraries.v4Support
} }