Omit the stdlib from the compiler plugin and gradle plugin artifacts (#…

…218) * Omit the stdlib from the compiler plugin and gradle plugin artifacts Resolves #199 * Add stdlib deps where appropriate
ZacSweers · May 12, 2024 · 4a5a3de · 4a5a3de
1 parent d863e2a
commit 4a5a3de
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+**Unreleased**
+--------------
+
+- Omit the stdlib from transitive dependencies on the compiler plugin and Gradle plugin artifacts. Both kotlinc and Gradle impose their own versions on the classpath.
+
 1.8.1
 -----
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -41,6 +41,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-gradlePlugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
 kotlin-aptEmbeddable = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable", version.ref = "kotlin" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 
 ksp = { module = "com.google.devtools.ksp:symbol-processing", version.ref = "ksp" }
 ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }

diff --git a/redacted-compiler-plugin-gradle/build.gradle.kts b/redacted-compiler-plugin-gradle/build.gradle.kts
@@ -85,6 +85,7 @@ spotless {
 dependencies {
   compileOnly(libs.kotlin.gradlePlugin)
   compileOnly(libs.kotlin.gradlePlugin.api)
+  compileOnly(libs.kotlin.stdlib)
 }
 
 configure<MavenPublishBaseExtension> { publishToMavenCentral(automaticRelease = true) }

diff --git a/redacted-compiler-plugin-gradle/gradle.properties b/redacted-compiler-plugin-gradle/gradle.properties
@@ -2,6 +2,9 @@ POM_NAME=Redacted Compiler Plugin (Gradle)
 POM_ARTIFACT_ID=redacted-compiler-plugin-gradle
 POM_PACKAGING=jar
 
+# Gradle imposes its own
+kotlin.stdlib.default.dependency=false
+
 GROUP=dev.zacsweers.redacted
 VERSION_NAME=1.9.0-SNAPSHOT
 POM_DESCRIPTION=A Kotlin compiler plugin that generates redacted toString() implementations.

diff --git a/redacted-compiler-plugin/build.gradle.kts b/redacted-compiler-plugin/build.gradle.kts
@@ -11,10 +11,12 @@ tasks.withType<Test>().configureEach {
 
 dependencies {
   compileOnly(libs.kotlin.compilerEmbeddable)
+  compileOnly(libs.kotlin.stdlib)
   implementation(libs.autoService)
   ksp(libs.autoService.ksp)
 
   testImplementation(libs.kotlin.reflect)
+  testImplementation(libs.kotlin.stdlib)
   testImplementation(libs.kotlin.compilerEmbeddable)
   // Cover for https://github.com/tschuchortdev/kotlin-compile-testing/issues/274
   testImplementation(libs.kotlin.aptEmbeddable)

diff --git a/redacted-compiler-plugin/gradle.properties b/redacted-compiler-plugin/gradle.properties
@@ -1,3 +1,6 @@
 POM_NAME=Redacted Compiler Plugin
 POM_ARTIFACT_ID=redacted-compiler-plugin
 POM_PACKAGING=jar
+
+# kotlinc imposes its own
+kotlin.stdlib.default.dependency=false