Merge pull request #853 from square/joel.kotlin-bom

Include the kotlin BOM, primarily for lagging transitive kotlin-refle…
square · Jan 25, 2024 · 38fee3b · 38fee3b
2 parents f772d7d + d13c27f
commit 38fee3b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 1 deletion.
diff --git a/compiler-api/build.gradle.kts b/compiler-api/build.gradle.kts
@@ -18,4 +18,6 @@ publish {
 dependencies {
   api(project(":annotations"))
   api(libs.kotlin.compiler)
+
+  implementation(platform(libs.kotlin.bom))
 }
diff --git a/compiler-api/dependencies/runtimeClasspath.txt b/compiler-api/dependencies/runtimeClasspath.txt
@@ -1,7 +1,8 @@
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
+org.jetbrains.kotlin:kotlin-bom:1.9.22
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22
-org.jetbrains.kotlin:kotlin-reflect:1.6.10
+org.jetbrains.kotlin:kotlin-reflect:1.9.22
 org.jetbrains.kotlin:kotlin-script-runtime:1.9.22
 org.jetbrains.kotlin:kotlin-stdlib:1.9.22
 org.jetbrains:annotations:13.0
diff --git a/compiler-utils/build.gradle.kts b/compiler-utils/build.gradle.kts
@@ -26,6 +26,7 @@ dependencies {
   api(libs.kotlin.compiler)
   api(libs.kotlinpoet)
 
+  implementation(platform(libs.kotlin.bom))
   implementation(libs.dagger2)
   implementation(libs.inject)
 

diff --git a/compiler-utils/dependencies/runtimeClasspath.txt b/compiler-utils/dependencies/runtimeClasspath.txt
@@ -3,6 +3,7 @@ com.squareup:kotlinpoet-jvm:1.16.0
 com.squareup:kotlinpoet:1.16.0
 javax.inject:javax.inject:1
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
+org.jetbrains.kotlin:kotlin-bom:1.9.22
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22
 org.jetbrains.kotlin:kotlin-reflect:1.9.22

diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {
   implementation(project(":annotations"))
   implementation(project(":compiler-api"))
   implementation(project(":compiler-utils"))
+  implementation(platform(libs.kotlin.bom))
   implementation(libs.dagger2)
   implementation(libs.jsr250)
   implementation(libs.kotlinpoet)

diff --git a/compiler/dependencies/runtimeClasspath.txt b/compiler/dependencies/runtimeClasspath.txt
@@ -5,6 +5,7 @@ com.squareup:kotlinpoet:1.16.0
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
+org.jetbrains.kotlin:kotlin-bom:1.9.22
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22
 org.jetbrains.kotlin:kotlin-reflect:1.9.22

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -109,6 +109,7 @@ kotest-assertions-api = { module = "io.kotest:kotest-assertions-api", version.re
 kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
 
 kotlin-annotationProcessingEmbeddable = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable", version.ref = "kotlin" }
+kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
 kotlin-compileTesting = { module = "dev.zacsweers.kctfork:core", version.ref = "kct" }
 kotlin-compileTesting-ksp = { module = "dev.zacsweers.kctfork:ksp", version.ref = "kct" }
 kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }