Fix nonJvm and jvmLincheck sourcesets.

ReactiveCircus · Feb 23, 2024 · 76e44e2 · 76e44e2
1 parent d0f9f74
commit 76e44e2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
@@ -5,4 +5,3 @@ org.gradle.configuration-cache=true
 org.gradle.configuration-cache.problems=warn
 
 kotlin.code.style=official
-kotlin.experimental.tryK2=true
diff --git a/...rc/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt b/...rc/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt
@@ -183,22 +183,19 @@ private fun KotlinMultiplatformExtension.configureTargets(project: Project) {
     applyDefaultHierarchyTemplate()
 
     sourceSets {
-        val jvmAndIos by creating {
+        val nonJvmMain by creating {
             dependsOn(commonMain.get())
         }
-        iosMain.get().dependsOn(jvmAndIos)
-        jvmMain.get().dependsOn(jvmAndIos)
-
-        val nonJvm by creating {
-            dependsOn(commonMain.get())
+        val jvmLincheck by getting {
+            dependsOn(jvmMain.get())
         }
-        jsMain.get().dependsOn(nonJvm)
+        jsMain.get().dependsOn(nonJvmMain)
         @Suppress("UnusedPrivateProperty")
         val wasmJsMain by getting {
-            dependsOn(nonJvm)
+            dependsOn(nonJvmMain)
         }
-        appleMain.get().dependsOn(nonJvm)
-        linuxMain.get().dependsOn(nonJvm)
-        mingwMain.get().dependsOn(nonJvm)
+        appleMain.get().dependsOn(nonJvmMain)
+        linuxMain.get().dependsOn(nonJvmMain)
+        mingwMain.get().dependsOn(nonJvmMain)
     }
 }
diff --git a/cache4k/build.gradle.kts b/cache4k/build.gradle.kts
@@ -24,7 +24,6 @@ kotlin {
         }
         jvmLincheck {
             dependencies {
-                dependsOn(jvmMain)
                 implementation(kotlin("test-junit5"))
                 implementation(libs.lincheck)
             }

diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,3 @@ org.gradle.configureondemand=true
 org.gradle.caching=true
 
 kotlin.code.style=official
-kotlin.experimental.tryK2=false
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@ org.gradle.configuration-cache=true
		org.gradle.configuration-cache.problems=warn

		kotlin.code.style=official
		kotlin.experimental.tryK2=true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,3 @@ org.gradle.configureondemand=true
		org.gradle.caching=true

		kotlin.code.style=official
		kotlin.experimental.tryK2=false