diff --git a/build-logic/src/main/kotlin/plugins/KmpTargetSetup.kt b/build-logic/src/main/kotlin/plugins/KmpTargetSetup.kt index a2f7ac4..e205e37 100644 --- a/build-logic/src/main/kotlin/plugins/KmpTargetSetup.kt +++ b/build-logic/src/main/kotlin/plugins/KmpTargetSetup.kt @@ -24,4 +24,4 @@ fun KotlinMultiplatformExtension.setupKmpTargets( onBinariesFramework(this) } } -} \ No newline at end of file +} diff --git a/build-logic/src/main/kotlin/plugins/android-lib-setup.gradle.kts b/build-logic/src/main/kotlin/plugins/android-lib-setup.gradle.kts index 15ba360..fe7618c 100644 --- a/build-logic/src/main/kotlin/plugins/android-lib-setup.gradle.kts +++ b/build-logic/src/main/kotlin/plugins/android-lib-setup.gradle.kts @@ -20,4 +20,4 @@ android { sourceCompatibility = Config.javaVersion targetCompatibility = Config.javaVersion } -} \ No newline at end of file +} diff --git a/build-logic/src/main/kotlin/plugins/compose-module-setup.gradle.kts b/build-logic/src/main/kotlin/plugins/compose-module-setup.gradle.kts deleted file mode 100644 index b078465..0000000 --- a/build-logic/src/main/kotlin/plugins/compose-module-setup.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id("org.jetbrains.kotlin.multiplatform") - id("org.jetbrains.compose") - id("org.jetbrains.kotlin.plugin.compose") -} - -kotlin { - sourceSets { - commonMain.dependencies { - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material) - implementation(compose.ui) - implementation(compose.components.resources) - } - } -} diff --git a/build-logic/src/main/kotlin/plugins/sample-setup.gradle.kts b/build-logic/src/main/kotlin/plugins/sample-setup.gradle.kts index 3b06b6c..0ef6c26 100644 --- a/build-logic/src/main/kotlin/plugins/sample-setup.gradle.kts +++ b/build-logic/src/main/kotlin/plugins/sample-setup.gradle.kts @@ -3,8 +3,6 @@ import config.Config plugins { id("com.android.application") id("org.jetbrains.kotlin.multiplatform") - id("org.jetbrains.compose") - id("org.jetbrains.kotlin.plugin.compose") } android { @@ -40,15 +38,3 @@ android { } } } - -kotlin { - sourceSets { - commonMain.dependencies { - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material) - implementation(compose.ui) - implementation(compose.components.resources) - } - } -} diff --git a/rinku-compose-ext/build.gradle.kts b/rinku-compose-ext/build.gradle.kts index ba9c9d1..8324aa7 100644 --- a/rinku-compose-ext/build.gradle.kts +++ b/rinku-compose-ext/build.gradle.kts @@ -3,8 +3,10 @@ import config.Config import plugins.setupKmpTargets plugins { + id("org.jetbrains.kotlin.multiplatform") id("android-lib-setup") - id("compose-module-setup") + id("org.jetbrains.compose") + id("org.jetbrains.kotlin.plugin.compose") id("publish-setup") id("detekt-setup") } @@ -22,6 +24,11 @@ kotlin { } commonMain.dependencies { implementation(projects.rinku.rinkuCore) + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + implementation(compose.components.resources) implementation(libs.kotlinx.coroutines.core) } commonTest.dependencies { diff --git a/samples/common/build.gradle.kts b/samples/common/build.gradle.kts index d812a38..4e32fed 100644 --- a/samples/common/build.gradle.kts +++ b/samples/common/build.gradle.kts @@ -3,8 +3,10 @@ import plugins.setupKmpTargets plugins { alias(libs.plugins.kotlinSerialization) + id("org.jetbrains.kotlin.multiplatform") + id("org.jetbrains.compose") + id("org.jetbrains.kotlin.plugin.compose") id("android-lib-setup") - id("compose-module-setup") id("detekt-setup") } @@ -18,6 +20,11 @@ kotlin { sourceSets { commonMain.dependencies { implementation(projects.rinku.rinkuCore) + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + implementation(compose.components.resources) implementation(libs.kotlinx.serialization) } } diff --git a/samples/decompose/build.gradle.kts b/samples/decompose/build.gradle.kts index c4bbd77..fe3a77f 100644 --- a/samples/decompose/build.gradle.kts +++ b/samples/decompose/build.gradle.kts @@ -2,6 +2,8 @@ import config.Config plugins { id("sample-setup") + id("org.jetbrains.compose") + id("org.jetbrains.kotlin.plugin.compose") id("kotlin-parcelize") id("detekt-setup") alias(libs.plugins.kotlinSerialization) @@ -31,6 +33,11 @@ kotlin { implementation(projects.rinku.rinkuCore) implementation(projects.rinku.rinkuComposeExt) implementation(projects.samples.common) + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + implementation(compose.components.resources) implementation(libs.decompose) implementation(libs.decompose.compose) implementation(libs.kotlinx.serialization) diff --git a/samples/voyager/build.gradle.kts b/samples/voyager/build.gradle.kts index 004fe4e..1ffb45a 100644 --- a/samples/voyager/build.gradle.kts +++ b/samples/voyager/build.gradle.kts @@ -3,6 +3,8 @@ import plugins.setupKmpTargets plugins { id("sample-setup") + id("org.jetbrains.compose") + id("org.jetbrains.kotlin.plugin.compose") id("detekt-setup") alias(libs.plugins.kotlinSerialization) } @@ -30,6 +32,11 @@ kotlin { commonMain.dependencies { api(projects.rinku.rinkuCore) + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + implementation(compose.components.resources) implementation(projects.rinku.rinkuComposeExt) implementation(projects.samples.common) implementation(libs.voyager.navigator)