diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-07-05 14:21:03 +0200 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-07-06 13:22:08 +0200 |
| commit | 3bd24e655f63d347c399125d4f7880c50c2e3931 (patch) | |
| tree | ccc36e9cb41fd005f7d3aca652d942ad88477bbe | |
| parent | ec472cb45ace58b2f159d42f439f51199ca5e34b (diff) | |
| download | qtlocation-mapboxgl-3bd24e655f63d347c399125d4f7880c50c2e3931.tar.gz | |
[android] - added Kotlin dependencies to the test app
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 4 | ||||
| -rw-r--r-- | platform/android/build.gradle | 6 | ||||
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 80be26d3ae..d21eb73382 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -53,6 +53,7 @@ android { } dependencies { + implementation dependenciesList.kotlinLib api(project(':MapboxGLAndroidSDK')) implementation dependenciesList.mapboxJavaServices @@ -82,3 +83,6 @@ apply from: "${rootDir}/gradle/gradle-checkstyle.gradle" apply from: "${rootDir}/gradle/gradle-lint.gradle" + +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 358c896bd0..49720f2e1f 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -1,4 +1,5 @@ buildscript { + apply from: "${rootDir}/gradle/dependencies.gradle" repositories { jcenter() @@ -6,7 +7,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' - classpath "com.jaredsburrows:gradle-license-plugin:0.8.41" + classpath dependenciesList.licensesPlugin + classpath dependenciesList.kotlinPlugin } } @@ -24,8 +26,6 @@ subprojects { apply from: "${rootDir}/gradle/dependencies.gradle" } -apply from: "${rootDir}/gradle/dependencies.gradle" - // Load build system information. If this file does not exist, run // `make platform/android/gradle/configuration.gradle` apply from: "${rootDir}/gradle/configuration.gradle" diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index d1f2b37103..76996378dd 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -19,7 +19,9 @@ ext { mockito : '2.18.3', robolectric : '3.8', timber : '4.7.0', - okhttp : '3.10.0' + okhttp : '3.10.0', + kotlin : '1.2.50', + licenses : '0.8.41' ] dependenciesList = [ @@ -51,6 +53,10 @@ ext { timber : "com.jakewharton.timber:timber:${versions.timber}", okhttp3 : "com.squareup.okhttp3:okhttp:${versions.okhttp}", leakCanaryDebug : "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}", - leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakCanary}" + leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakCanary}", + + kotlinLib : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}", + kotlinPlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}", + licensesPlugin : "com.jaredsburrows:gradle-license-plugin:${versions.licenses}" ] } |