diff --git a/buildlogic/convention/src/main/kotlin/ComposeMultiplatformConventionPlugin.kt b/buildlogic/convention/src/main/kotlin/ComposeMultiplatformConventionPlugin.kt index 49bc7b0..ff09f55 100644 --- a/buildlogic/convention/src/main/kotlin/ComposeMultiplatformConventionPlugin.kt +++ b/buildlogic/convention/src/main/kotlin/ComposeMultiplatformConventionPlugin.kt @@ -10,8 +10,8 @@ class ComposeMultiplatformConventionPlugin : Plugin { override fun apply(target: Project) = with(target) { with(pluginManager) { - apply(libs.findPlugin("compose.plugin").get().get().pluginId) - apply(libs.findPlugin("compose.multiplatform").get().get().pluginId) + apply(libs.findPlugin("composeCompiler").get().get().pluginId) + apply(libs.findPlugin("composeMultiplatform").get().get().pluginId) } val composeDeps = extensions.getByType().dependencies diff --git a/buildlogic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt b/buildlogic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt index 911053d..3ccbda4 100644 --- a/buildlogic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt +++ b/buildlogic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt @@ -11,27 +11,10 @@ class KotlinMultiplatformConventionPlugin : Plugin { override fun apply(target: Project) = with(target) { with(pluginManager) { - apply( - libs - .findPlugin("android.library") - .get() - .get() - .pluginId, - ) - apply( - libs - .findPlugin("kotlin.multiplatform") - .get() - .get() - .pluginId, - ) - apply( - libs - .findPlugin("kotlin.serialization") - .get() - .get() - .pluginId, - ) + apply(libs.findPlugin("androidLibrary").get().get().pluginId) + apply(libs.findPlugin("androidMultiplatform").get().get().pluginId) + apply(libs.findPlugin("kotlinMultiplatform").get().get().pluginId) + apply(libs.findPlugin("kotlinSerialization").get().get().pluginId) } extensions.configure(::configureKotlinMultiplatform) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e1b2c0c..2886b55 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,8 +31,8 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" } androidMultiplatform = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" } composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" } composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } # Buildlogic defined plugins -> buildlogic/convention/build.gradle.kts composeKit = { id = "dev.carlosmartino.plugins.composeMultiplatform", version = "unspecified" }