Fix Gradle tests.

touchlab · Jul 29, 2024 · 8b6671c · 8b6671c
1 parent e52e0fd
commit 8b6671c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/SKIE/common/configuration/annotations/impl/build.gradle.kts b/SKIE/common/configuration/annotations/impl/build.gradle.kts
@@ -124,6 +124,20 @@ kotlin {
 
     @targets@
 
+    sourceSets.commonMain {
+        dependencies {
+            compileOnly(kotlin("stdlib-common"))
+        }
+    }
+
+    sourceSets["jvmMain"].dependencies {
+        compileOnly(kotlin("stdlib"))
+    }
+
+    sourceSets["jsMain"].dependencies {
+        compileOnly(kotlin("stdlib-js"))
+    }
+
 //     jvm()
 //     js {
 //         browser()

diff --git a/SKIE/runtime/kotlin/impl/build.gradle.kts b/SKIE/runtime/kotlin/impl/build.gradle.kts
@@ -92,6 +92,7 @@ kotlin {
 
     sourceSets.commonMain {
         dependencies {
+            compileOnly(kotlin("stdlib-common"))
             @dependencies@
         }
     }

diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt
@@ -4,6 +4,7 @@ import co.touchlab.skie.test.runner.BuildConfiguration
 import co.touchlab.skie.test.util.KotlinTarget
 import co.touchlab.skie.test.util.KotlinVersion
 import co.touchlab.skie.test.util.LinkMode
+import co.touchlab.skie.test.util.coroutinesVersion
 import co.touchlab.skie.test.util.needsOldLinker
 import org.intellij.lang.annotations.Language
 
@@ -142,7 +143,7 @@ class BuildGradleBuilder(
         fun includeCoroutinesDependency() {
             "sourceSets.commonMain" {
                 "dependencies" {
-                    +"""implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")"""
+                    +"""implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${kotlinVersion.coroutinesVersion}")"""
                 }
             }
         }

diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinVersion.needsOldLinker.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinVersion.needsOldLinker.kt
@@ -2,3 +2,12 @@ package co.touchlab.skie.test.util
 
 val KotlinVersion.needsOldLinker: Boolean
     get() = value.startsWith("1.8.") || value.startsWith("1.9.0")
+
+val KotlinVersion.coroutinesVersion: String
+    get() = when {
+        value.startsWith("2.0.") -> "1.9.0-RC"
+        value.startsWith("1.9.2") -> "1.8.1"
+        value.startsWith("1.9.") || value.startsWith("1.8.2") -> "1.7.3"
+        value.startsWith("1.8.") -> "1.6.4"
+        else -> error("Coroutines version not assigned for Kotlin version $value")
+    }