From aa10c910c00dd54bf4e24bf74ed7bd292d93e2c6 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 15 Sep 2021 11:29:46 -0700
Subject: [PATCH] build: Fix dependency scopes in Kotlin module

---
 cloud-kotlin-extensions/build.gradle.kts | 28 +++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/cloud-kotlin-extensions/build.gradle.kts b/cloud-kotlin-extensions/build.gradle.kts
index 2df4d67e..30688979 100644
--- a/cloud-kotlin-extensions/build.gradle.kts
+++ b/cloud-kotlin-extensions/build.gradle.kts
@@ -6,21 +6,29 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
 }
 
-configurations.all {
-    dependencies.removeIf { it.group == "org.jetbrains.kotlin" }
+val compileAndTest: Configuration by configurations.creating
+
+configurations {
+    all {
+        dependencies.removeIf { it.group == "org.jetbrains.kotlin" }
+    }
+
+    compileOnly {
+        extendsFrom(compileAndTest)
+    }
+    testImplementation {
+        extendsFrom(compileAndTest)
+    }
 }
 
 dependencies {
     api(project(":cloud-core"))
-    implementation(kotlin("stdlib-jdk8"))
 
-    implementation(project(":cloud-annotations"))
-    implementation(kotlin("reflect"))
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.5.2")
-
-    testImplementation("org.jetbrains.kotlin", "kotlin-test-junit5")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.5.2")
+    compileAndTest(project(":cloud-annotations"))
+    compileAndTest(kotlin("stdlib-jdk8"))
+    compileAndTest(kotlin("reflect"))
+    compileAndTest("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
+    compileAndTest("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.5.2")
 }
 
 tasks {