From 6295ee2da15d718ff88e584bcb93bfa2c3c3f687 Mon Sep 17 00:00:00 2001 From: cketti Date: Tue, 14 May 2024 23:32:53 +0200 Subject: [PATCH 1/3] Clean up source set configuration --- kotlin-codepoints-deluxe/build.gradle.kts | 5 +++-- kotlin-codepoints/build.gradle.kts | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kotlin-codepoints-deluxe/build.gradle.kts b/kotlin-codepoints-deluxe/build.gradle.kts index d5cc320..8838681 100644 --- 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 index 8b42212..a244b48 100644 --- a/kotlin-codepoints/build.gradle.kts +++ b/kotlin-codepoints/build.gradle.kts @@ -49,15 +49,14 @@ kotlin { watchosSimulatorArm64() sourceSets { - val commonMain by getting - val commonTest by getting { + commonTest { dependencies { implementation(kotlin("test")) } } val commonImplementation by creating { - dependsOn(commonMain) + dependsOn(commonMain.get()) } } From 851f17ac3590bcb5008886baa536a113d8234152 Mon Sep 17 00:00:00 2001 From: cketti Date: Tue, 14 May 2024 23:47:49 +0200 Subject: [PATCH 2/3] Rename `commonImplementation` to `nonJvmMain` --- kotlin-codepoints/build.gradle.kts | 4 ++-- .../{commonImplementation => nonJvmMain}/kotlin/CodePoints.kt | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename kotlin-codepoints/src/{commonImplementation => nonJvmMain}/kotlin/CodePoints.kt (100%) diff --git a/kotlin-codepoints/build.gradle.kts b/kotlin-codepoints/build.gradle.kts index a244b48..df36877 100644 --- a/kotlin-codepoints/build.gradle.kts +++ b/kotlin-codepoints/build.gradle.kts @@ -55,14 +55,14 @@ kotlin { } } - val commonImplementation by creating { + val nonJvmMain by creating { dependsOn(commonMain.get()) } } targets.onEach { if (it.platformType != KotlinPlatformType.jvm) { - it.compilations.getByName("main").source(sourceSets.getByName("commonImplementation")) + it.compilations.getByName("main").source(sourceSets.getByName("nonJvmMain")) } } } diff --git a/kotlin-codepoints/src/commonImplementation/kotlin/CodePoints.kt b/kotlin-codepoints/src/nonJvmMain/kotlin/CodePoints.kt similarity index 100% rename from kotlin-codepoints/src/commonImplementation/kotlin/CodePoints.kt rename to kotlin-codepoints/src/nonJvmMain/kotlin/CodePoints.kt From f0b924d3b7967881c03178b4de017f93b0247cdd Mon Sep 17 00:00:00 2001 From: cketti Date: Tue, 14 May 2024 23:48:25 +0200 Subject: [PATCH 3/3] Use `applyDefaultHierarchyTemplate()` to create "nonJvm" group --- kotlin-codepoints/build.gradle.kts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/kotlin-codepoints/build.gradle.kts b/kotlin-codepoints/build.gradle.kts index df36877..94479d8 100644 --- 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,22 +48,21 @@ kotlin { watchosX64() watchosSimulatorArm64() + @OptIn(ExperimentalKotlinGradlePluginApi::class) + applyDefaultHierarchyTemplate { + group("nonJvm") { + withJs() + withNative() + withWasm() + } + } + sourceSets { commonTest { dependencies { implementation(kotlin("test")) } } - - val nonJvmMain by creating { - dependsOn(commonMain.get()) - } - } - - targets.onEach { - if (it.platformType != KotlinPlatformType.jvm) { - it.compilations.getByName("main").source(sourceSets.getByName("nonJvmMain")) - } } }