From 3cd587672311631c353862452efbc27aedd4973a Mon Sep 17 00:00:00 2001 From: Marcelo Hernandez Date: Sun, 26 Jan 2020 20:35:31 -0800 Subject: [PATCH] Group Kotlin dependencies --- demo/build.gradle | 2 +- dependencies.gradle | 6 ++++-- scarlet-core-internal/build.gradle | 4 ++-- scarlet-core/build.gradle | 2 +- scarlet-lifecycle-android/build.gradle | 2 +- scarlet-message-adapter-builtin/build.gradle | 4 ++-- scarlet-message-adapter-gson/build.gradle | 4 ++-- scarlet-message-adapter-jackson/build.gradle | 4 ++-- scarlet-message-adapter-moshi/build.gradle | 4 ++-- scarlet-message-adapter-protobuf/build.gradle | 4 ++-- scarlet-stream-adapter-builtin/build.gradle | 4 ++-- scarlet-stream-adapter-coroutines/build.gradle | 4 ++-- scarlet-stream-adapter-rxjava/build.gradle | 4 ++-- scarlet-stream-adapter-rxjava2/build.gradle | 4 ++-- scarlet-test-utils/build.gradle | 2 +- scarlet-websocket-mockwebserver/build.gradle | 2 +- scarlet-websocket-okhttp/build.gradle | 4 ++-- scarlet/build.gradle | 4 ++-- 18 files changed, 33 insertions(+), 31 deletions(-) diff --git a/demo/build.gradle b/demo/build.gradle index d55a0b8a..9d6ffd0f 100755 --- 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 index ad7835eb..3932c9d5 100644 --- 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 index 01f458f8..e4332fbb 100644 --- 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 } \ No newline at end of file diff --git a/scarlet-core/build.gradle b/scarlet-core/build.gradle index 12a3f853..1c6e38c9 100644 --- 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 index 1a3eb1da..3f47afd6 100755 --- 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 index f48d8487..210fc346 100644 --- 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 index be2731d8..9b817ce0 100755 --- 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 } \ No newline at end of file diff --git a/scarlet-message-adapter-jackson/build.gradle b/scarlet-message-adapter-jackson/build.gradle index e1c218fc..0d2e7419 100755 --- 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 } \ No newline at end of file diff --git a/scarlet-message-adapter-moshi/build.gradle b/scarlet-message-adapter-moshi/build.gradle index 49042f92..c44b62a2 100755 --- 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 } \ No newline at end of file diff --git a/scarlet-message-adapter-protobuf/build.gradle b/scarlet-message-adapter-protobuf/build.gradle index 27b77847..237b2aed 100755 --- 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 } \ No newline at end of file diff --git a/scarlet-stream-adapter-builtin/build.gradle b/scarlet-stream-adapter-builtin/build.gradle index 76f965f8..b011787c 100644 --- 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 } \ No newline at end of file diff --git a/scarlet-stream-adapter-coroutines/build.gradle b/scarlet-stream-adapter-coroutines/build.gradle index 99555812..e61cf7e9 100644 --- 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 index 20fba0c4..f5eafbb7 100755 --- 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 index 35a83b63..affe606d 100755 --- 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 index 43d93080..bbd1a99a 100644 --- 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 } \ No newline at end of file diff --git a/scarlet-websocket-mockwebserver/build.gradle b/scarlet-websocket-mockwebserver/build.gradle index d3d4a47a..9979e3c2 100644 --- 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 } \ No newline at end of file diff --git a/scarlet-websocket-okhttp/build.gradle b/scarlet-websocket-okhttp/build.gradle index 088b6df1..e8ed314c 100644 --- 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 index 2a7355b5..40b0aba2 100644 --- 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 }