diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 58e80c0..487c754 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -20,10 +20,12 @@
{
"matchPackageNames": [
"com.google.devtools.ksp",
- "org.jetbrains.kotlin:kotlin-gradle-plugin",
"org.jetbrains.kotlin:kotlin-compiler-embeddable",
+ "org.jetbrains.kotlin:kotlin-gradle-plugin",
+ "org.jetbrains.kotlin:kotlin-gradle-plugin-api",
],
"groupName": "Kotlin",
+ "enabled": false,
},
],
}
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index f8467b4..fdf8d99 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 5c659c6..5f160e2 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -2,5 +2,5 @@ plugins { `kotlin-dsl` }
dependencies {
implementation(libs.android.gradle.plugin)
- implementation(libs.kotlin.gradle.plugin)
+ implementation(libs.kotlin.gradlePlugin)
}
diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts
index 25264f8..053d6cc 100644
--- a/compiler-plugin/build.gradle.kts
+++ b/compiler-plugin/build.gradle.kts
@@ -20,6 +20,7 @@ tasks.test.configure {
}
dependencies {
+ implementation(platform(embeddedKotlin("bom")))
compileOnly(libs.kotlin.compiler)
ksp(libs.auto.ksp)
compileOnly(libs.auto.annotations)
diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
index 336ecb9..099dcef 100644
--- a/gradle-plugin/build.gradle.kts
+++ b/gradle-plugin/build.gradle.kts
@@ -20,7 +20,9 @@ gradlePlugin.plugins.register("dev.msfjarvis.tracelog") {
}
dependencies {
- compileOnly(libs.kotlin.gradle.plugin)
- ksp(libs.auto.ksp)
+ implementation(platform(embeddedKotlin("bom")))
compileOnly(libs.auto.annotations)
+ compileOnly(libs.kotlin.gradlePlugin.api)
+ compileOnly(libs.kotlin.stdlib)
+ ksp(libs.auto.ksp)
}
diff --git a/gradle-plugin/gradle.properties b/gradle-plugin/gradle.properties
new file mode 100644
index 0000000..0d6aa7b
--- /dev/null
+++ b/gradle-plugin/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8364d51..6c0fb9d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,9 @@
[versions]
junit = "5.10.0"
-kotlin = "1.9.10"
[plugins]
buildconfig = "com.github.gmazzo.buildconfig:4.1.2"
-ksp = "com.google.devtools.ksp:1.9.10-1.0.13"
+ksp = "com.google.devtools.ksp:1.9.0-1.0.13"
spotless = "com.diffplug.spotless:6.20.0"
[libraries]
@@ -15,7 +14,9 @@ junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.re
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
junit-legacy = "junit:junit:4.13.2"
kct = "dev.zacsweers.kctfork:core:0.3.2"
-kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin"}
+kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable" }
+kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin" }
+kotlin-gradlePlugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" }
mordant = "com.github.ajalt.mordant:mordant:2.1.0"
truth = "com.google.truth:truth:1.1.5"
diff --git a/sample-jvm/build.gradle.kts b/sample-jvm/build.gradle.kts
index 489c2be..11c2be2 100644
--- a/sample-jvm/build.gradle.kts
+++ b/sample-jvm/build.gradle.kts
@@ -17,6 +17,7 @@ tasks.withType().configureEach {
}
dependencies {
+ implementation(platform(embeddedKotlin("bom")))
kotlinCompilerPluginClasspath(projects.compilerPlugin)
implementation(projects.runtime)
implementation(libs.mordant)
diff --git a/sample-kmp/build.gradle.kts b/sample-kmp/build.gradle.kts
index 4c87d08..0ab4015 100644
--- a/sample-kmp/build.gradle.kts
+++ b/sample-kmp/build.gradle.kts
@@ -22,6 +22,7 @@ kotlin {
macosX64 { configureTarget() }
dependencies {
+ commonMainImplementation(platform(embeddedKotlin("bom")))
kotlinCompilerPluginClasspath(projects.compilerPlugin)
commonMainImplementation(projects.runtime)
commonMainImplementation(libs.mordant)