Merge pull request #1238 from square/colinmarsch/cleanup-kotlin-depen…

…dencies Cleanup Kotlin dependencies and use latest Kotlin version
square · Apr 2, 2019 · 9d38b80 · 9d38b80
2 parents 73fc8e1 + dac0a0b
commit 9d38b80
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,23 +5,12 @@ buildscript {
     'minSdk': 14,
     'compileSdk': 28,
     'errorProne': '2.3.1',
-    'kotlin': '1.3.11',
+    'kotlin': '1.3.21',
   ]
   ext.deps = [
     'kotlin': [
       'gradlePlugin': "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
-      'stdLib': [
-        'common': "org.jetbrains.kotlin:kotlin-stdlib-common:${versions.kotlin}",
-        'jdk8': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}",
-        'jdk7': "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}",
-        'jdk6': "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
-      ],
-      'reflect': "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}",
-      'test': [
-        'common': "org.jetbrains.kotlin:kotlin-test-common",
-        'annotations': "org.jetbrains.kotlin:kotlin-test-annotations-common",
-        'jdk': "org.jetbrains.kotlin:kotlin-test-junit"
-      ]
+      'stdlib': "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
     ]
   ]
   repositories {

diff --git a/leakcanary-analyzer/build.gradle b/leakcanary-analyzer/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 dependencies {
-  implementation deps.kotlin.stdLib.jdk8
+  implementation deps.kotlin.stdlib
   implementation 'com.squareup.haha:haha:2.1'
   api project(':leakcanary-watcher')
   testImplementation 'junit:junit:4.12'

diff --git a/leakcanary-android-instrumentation/build.gradle b/leakcanary-android-instrumentation/build.gradle
@@ -2,10 +2,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 dependencies {
-  api deps.kotlin.stdLib.common
   api project(':leakcanary-android')
   implementation 'androidx.test:runner:1.1.1'
-  implementation deps.kotlin.reflect
+  implementation deps.kotlin.stdlib
 }
 
 android {

diff --git a/leakcanary-android/build.gradle b/leakcanary-android/build.gradle
@@ -11,7 +11,7 @@ dependencies {
   implementation 'androidx.core:core:1.0.1'
   implementation 'androidx.annotation:annotation:1.0.2'
   testImplementation 'junit:junit:4.12'
-  api deps.kotlin.stdLib.jdk6
+  implementation deps.kotlin.stdlib
 }
 
 def gitSha() {

diff --git a/leakcanary-sample/build.gradle b/leakcanary-sample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 dependencies {
-  implementation deps.kotlin.stdLib.jdk8
+  implementation deps.kotlin.stdlib
   implementation project(':leakcanary-android')
 
   testImplementation "junit:junit:4.12"