Update Kotlin plugin application

This allows gradle-maven-publish-plugin to access KotlinMultiplatformExtension in build-support while avoiding a plugin version conflict in the main project. The desired version of the Kotlin compiler is still used.
drewhamilton · Dec 16, 2024 · 9b060c4 · 9b060c4
1 parent 011378f
commit 9b060c4
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/build-support/build.gradle.kts b/build-support/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation(libs.kotlin.gradleApi)
+    implementation(libs.kotlin.gradle)
     implementation(libs.plugin.buildconfig)
     implementation(libs.plugin.mavenPublish)
     implementation(libs.plugin.dokka)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.kotlin.multiplatform) apply false
+    // Note: kotlin-jvm and kotlin-multiplatform plugins are added implicitly via build-support
+
     alias(libs.plugins.kotlinx.binaryCompatibilityValidator) apply false
     alias(libs.plugins.ksp) apply false
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,6 +24,7 @@ kotlinCompileTestingFork = { module = "dev.zacsweers.kctfork:core", version.ref
 kotlin-embeddableCompiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-gradleApi = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
 
 assertk = "com.willowtreeapps.assertk:assertk:0.28.1"

diff --git a/poko-annotations/build.gradle.kts b/poko-annotations/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
-  alias(libs.plugins.kotlin.multiplatform)
+  id("org.jetbrains.kotlin.multiplatform")
 }
 
 pokoBuild {

diff --git a/poko-compiler-plugin/build.gradle.kts b/poko-compiler-plugin/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id("org.jetbrains.kotlin.jvm")
     alias(libs.plugins.ksp)
 }
 

diff --git a/poko-gradle-plugin/build.gradle.kts b/poko-gradle-plugin/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `java-gradle-plugin`
-    alias(libs.plugins.kotlin.jvm)
+    id("org.jetbrains.kotlin.jvm")
 }
 
 pokoBuild {

diff --git a/poko-tests-without-k2/build.gradle.kts b/poko-tests-without-k2/build.gradle.kts
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  alias(libs.plugins.kotlin.multiplatform)
+  id("org.jetbrains.kotlin.multiplatform")
 }
 
 tasks.withType<KotlinCompile>().configureEach {

diff --git a/poko-tests/build.gradle.kts b/poko-tests/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.NATIVE_COMPILER_PLUGIN_CLASSPATH_CONFI
 import org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME
 
 plugins {
-  alias(libs.plugins.kotlin.multiplatform)
+  id("org.jetbrains.kotlin.multiplatform")
 }
 
 val jvmToolchainVersion: Int? = System.getenv()["poko_tests_jvm_toolchain_version"]?.toInt()

diff --git a/poko-tests/performance/build.gradle.kts b/poko-tests/performance/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id("org.jetbrains.kotlin.jvm")
 }
 
 dependencies {