From 454a50aee80f67ad7b79894ac6b667353766f69a Mon Sep 17 00:00:00 2001 From: alexstyl <1665273+alexstyl@users.noreply.github.com> Date: Wed, 21 Oct 2026 13:39:45 +0700 Subject: [PATCH] Always configure the supported system-ui platform targets --- build.gradle.kts | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ae7ceaa..f21b38d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget plugins { - id("com.android.kotlin.multiplatform.library") version "9.2.0" apply false + id("com.android.kotlin.multiplatform.library") version "9.2.0" alias(libs.plugins.jetbrains.kotlin.multiplatform) alias(libs.plugins.jetbrains.compose.compiler) id("com.composables.kpm") version "0.1.0" @@ -11,47 +11,31 @@ tasks.withType().configureEach { systemProperty("robolectric.dependency.repo.url", "https://repo.maven.apache.org/maven2") } -val standalone = gradle.parent == null -val wasmOnly = - !standalone && - providers.gradleProperty("storyboard.wasmOnly").map(String::toBooleanStrict).getOrElse(false) -val development = - !standalone && !wasmOnly && - providers - .gradleProperty("storyboard.development") - .map(String::toBooleanStrict) - .getOrElse(true) -val mobile = standalone || (!development && !wasmOnly) - -if (mobile) pluginManager.apply("com.android.kotlin.multiplatform.library") - kotlin { jvmToolchain(17) - if (!wasmOnly) jvm() + jvm() @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class) - if (!development) wasmJs { browser() } - if (mobile) { - targets.withType().configureEach { - namespace = "com.composables.systemui" - compileSdk = 37 - minSdk = 23 - withHostTest { isIncludeAndroidResources = true } - } - iosArm64() - iosSimulatorArm64() + wasmJs { browser() } + targets.withType().configureEach { + namespace = "com.composables.systemui" + compileSdk = 37 + minSdk = 23 + withHostTest { isIncludeAndroidResources = true } } + iosArm64() + iosSimulatorArm64() sourceSets { commonMain.dependencies { api(libs.compose.runtime) api(libs.compose.ui) } - if (mobile) androidMain.dependencies { implementation("androidx.core:core-ktx:1.17.0") } - if (mobile) getByName("androidHostTest").dependencies { + androidMain.dependencies { implementation("androidx.core:core-ktx:1.17.0") } + getByName("androidHostTest").dependencies { implementation(kotlin("test")) implementation("androidx.compose.ui:ui-test-junit4:1.12.0") implementation("androidx.compose.ui:ui-test-manifest:1.12.0") implementation("org.robolectric:robolectric:4.16") } - if (!wasmOnly) jvmTest.dependencies { implementation(kotlin("test")) } + jvmTest.dependencies { implementation(kotlin("test")) } } }