Merge pull request #37345 from m4gr3d/backport_kotlin_support
[3.2] Backport Kotlin support
This commit is contained in:
commit
e707b712e8
|
@ -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")) {
|
||||
|
|
|
@ -5,6 +5,7 @@ ext.versions = [
|
|||
targetSdk : 29,
|
||||
buildTools : '29.0.1',
|
||||
supportCoreUtils : '28.0.0',
|
||||
kotlinVersion : '1.3.61',
|
||||
v4Support : '28.0.0'
|
||||
|
||||
]
|
||||
|
@ -12,6 +13,8 @@ ext.versions = [
|
|||
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"
|
||||
]
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ buildscript {
|
|||
}
|
||||
dependencies {
|
||||
classpath libraries.androidGradlePlugin
|
||||
classpath libraries.kotlinGradlePlugin
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
apply plugin: 'com.android.library'
|
||||
apply plugin: 'kotlin-android'
|
||||
|
||||
dependencies {
|
||||
implementation libraries.supportCoreUtils
|
||||
implementation libraries.kotlinStdLib
|
||||
implementation libraries.v4Support
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue