Group Kotlin dependencies

Tinder · Jan 27, 2020 · 3cd5876 · 3cd5876
1 parent 28ccf2b
commit 3cd5876
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 31 deletions.
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation libs.dagger
     kapt libs.daggerCompiler
     compileOnly libs.jsr250Annotations
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
     implementation libs.mpAndroidChart
     implementation libs.chatMessageView
     implementation libs.filePicker

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -97,8 +97,10 @@ ext.libs = [
     mockito: "com.nhaarman:mockito-kotlin-kt1.1:$versions.mockito",
     assertJ: "org.assertj:assertj-core:$versions.assertJ",
 
-    kotlinStdlib: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
-    kotlinReflect: "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version",
+    kotlin: [
+        stdlib: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
+        reflect: "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    ],
 
     stateMachine: "com.tinder.statemachine:statemachine:$versions.stateMachine"
 ]
diff --git a/scarlet-core-internal/build.gradle b/scarlet-core-internal/build.gradle
@@ -6,11 +6,11 @@ dependencies {
     api project(':scarlet-core')
 
     implementation libs.rxJava
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-core/build.gradle b/scarlet-core/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'java-library'
 
 dependencies {
     api libs.reactiveStreams
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation libs.junit
     testImplementation libs.assertJ

diff --git a/scarlet-lifecycle-android/build.gradle b/scarlet-lifecycle-android/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     implementation libs.rxJava
     implementation libs.rxKotlin
     implementation libs.appCompat
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation libs.junit
 }

diff --git a/scarlet-message-adapter-builtin/build.gradle b/scarlet-message-adapter-builtin/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'java-library'
 
 dependencies {
     implementation project(':scarlet-core')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-message-adapter-gson/build.gradle b/scarlet-message-adapter-gson/build.gradle
@@ -7,13 +7,13 @@ dependencies {
 
     implementation project(':scarlet-core')
     implementation libs.okio
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet')
     testImplementation project(':scarlet-websocket-mockwebserver')
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-message-adapter-jackson/build.gradle b/scarlet-message-adapter-jackson/build.gradle
@@ -6,14 +6,14 @@ dependencies {
     api libs.jacksonDatabind
 
     implementation project(':scarlet-core')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet')
     testImplementation project(':scarlet-websocket-mockwebserver')
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
     testImplementation libs.jacksonModuleKotlin
 }
diff --git a/scarlet-message-adapter-moshi/build.gradle b/scarlet-message-adapter-moshi/build.gradle
@@ -6,13 +6,13 @@ dependencies {
     api libs.moshi
 
     implementation project(':scarlet-core')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet')
     testImplementation project(':scarlet-websocket-mockwebserver')
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-message-adapter-protobuf/build.gradle b/scarlet-message-adapter-protobuf/build.gradle
@@ -6,13 +6,13 @@ dependencies {
     api libs.protobuf
 
     implementation project(':scarlet-core')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet')
     testImplementation project(':scarlet-websocket-mockwebserver')
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-stream-adapter-builtin/build.gradle b/scarlet-stream-adapter-builtin/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin'
 
 dependencies {
     implementation project(':scarlet-core')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-stream-adapter-coroutines/build.gradle b/scarlet-stream-adapter-coroutines/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api libs.kotlinCoroutinesRxInterop
 
     implementation project(':scarlet-core')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet')
     testImplementation project(':scarlet-websocket-mockwebserver')
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-stream-adapter-rxjava/build.gradle b/scarlet-stream-adapter-rxjava/build.gradle
@@ -6,13 +6,13 @@ dependencies {
     api libs.rxJava1
 
     implementation project(':scarlet-core')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet')
     testImplementation project(':scarlet-websocket-mockwebserver')
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-stream-adapter-rxjava2/build.gradle b/scarlet-stream-adapter-rxjava2/build.gradle
@@ -6,13 +6,13 @@ dependencies {
     api libs.rxJava
 
     implementation project(':scarlet-core')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet')
     testImplementation project(':scarlet-websocket-mockwebserver')
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet-test-utils/build.gradle b/scarlet-test-utils/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly project(':scarlet')
     api libs.assertJ
     implementation libs.rxJava
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 }
diff --git a/scarlet-websocket-mockwebserver/build.gradle b/scarlet-websocket-mockwebserver/build.gradle
@@ -5,5 +5,5 @@ apply plugin: 'java-library'
 dependencies {
     api libs.mockWebServer
     api project(':scarlet-websocket-okhttp')
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 }
diff --git a/scarlet-websocket-okhttp/build.gradle b/scarlet-websocket-okhttp/build.gradle
@@ -8,13 +8,13 @@ dependencies {
 
     implementation project(':scarlet-core-internal')
     implementation libs.rxJava
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet')
     testImplementation project(':scarlet-websocket-mockwebserver')
     testImplementation project(':scarlet-test-utils')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }
diff --git a/scarlet/build.gradle b/scarlet/build.gradle
@@ -11,12 +11,12 @@ dependencies {
     implementation libs.stateMachine
     implementation libs.rxJava
     implementation libs.rxKotlin
-    implementation libs.kotlinStdlib
+    implementation libs.kotlin.stdlib
 
     testImplementation project(':scarlet-test-utils')
     testImplementation project(':scarlet-stream-adapter-rxjava2')
     testImplementation libs.junit
     testImplementation libs.mockito
-    testImplementation libs.kotlinReflect
+    testImplementation libs.kotlin.reflect
     testImplementation libs.assertJ
 }