Merge pull request #26 from nikolaykasyanov/cleanup

Dependency cleanup
careem · Mar 4, 2021 · 1919c3e · 1919c3e
2 parents 944260d + c0c7271
commit 1919c3e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ void setupMultiplatformLibrary(Project project, Boolean shouldPublish = true) {
         sourceSets {
             commonTest {
                 dependencies {
-                    implementation Deps.kotlin.test.common
+                    implementation Deps.kotlin.test
                     implementation Deps.kotlin.test.annotationsCommon
                 }
             }

diff --git a/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/buildSrc/src/main/kotlin/Deps.kt
@@ -35,16 +35,19 @@ object Deps {
     }
 
     object Kotlin {
-        val test = Test
+        val test = Test()
         const val plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
-        object Test {
-            const val common = "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
-            const val junit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-            const val js = "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion"
-            const val test = "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
-            const val annotationsCommon =
+        const val reflectJvm = "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+
+        class Test(private val name: String = "org.jetbrains.kotlin:kotlin-test:$kotlinVersion") :
+            CharSequence by name {
+            val annotationsCommon =
                 "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion"
+            val js = "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion"
+            val junit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
+
+            override fun toString() = name
         }
     }
 }
diff --git a/mockingbird/build.gradle b/mockingbird/build.gradle
@@ -7,17 +7,7 @@ kotlin {
             dependencies {
                 implementation Deps.kotlinx.atomicfu.common
                 implementation Deps.touchlab.stately.isolate.common
-                implementation kotlin('test')
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-
-        commonTest {
-            dependencies {
-                implementation kotlin('test')
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
+                implementation Deps.kotlin.test
             }
         }