Merge pull request #31 from cketti/update-build-config

Clean up source set configuration
cketti · May 16, 2024 · 7dce8fd · 7dce8fd
2 parents 947a96d + f0b924d
commit 7dce8fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/kotlin-codepoints-deluxe/build.gradle.kts b/kotlin-codepoints-deluxe/build.gradle.kts
@@ -47,12 +47,13 @@ kotlin {
     watchosSimulatorArm64()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 api(project(":kotlin-codepoints"))
             }
         }
-        val commonTest by getting {
+
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
             }

diff --git a/kotlin-codepoints/build.gradle.kts b/kotlin-codepoints/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -48,23 +48,21 @@ kotlin {
     watchosX64()
     watchosSimulatorArm64()
 
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    applyDefaultHierarchyTemplate {
+        group("nonJvm") {
+            withJs()
+            withNative()
+            withWasm()
+        }
+    }
+
     sourceSets {
-        val commonMain by getting
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
             }
         }
-
-        val commonImplementation by creating {
-            dependsOn(commonMain)
-        }
-    }
-
-    targets.onEach {
-        if (it.platformType != KotlinPlatformType.jvm) {
-            it.compilations.getByName("main").source(sourceSets.getByName("commonImplementation"))
-        }
     }
 }
 

diff --git a/...commonImplementation/kotlin/CodePoints.kt → ...oints/src/nonJvmMain/kotlin/CodePoints.kt b/...commonImplementation/kotlin/CodePoints.kt → ...oints/src/nonJvmMain/kotlin/CodePoints.kt