From d13c27f95a8334495d5867e61a8033d81ddebc04 Mon Sep 17 00:00:00 2001
From: Joel Wilcox <jwilcox@squareup.com>
Date: Fri, 19 Jan 2024 14:25:07 -0800
Subject: [PATCH] Include the kotlin BOM, primarily for lagging transitive
 kotlin-reflect versions

---
 compiler-api/build.gradle.kts                    | 2 ++
 compiler-api/dependencies/runtimeClasspath.txt   | 3 ++-
 compiler-utils/build.gradle.kts                  | 1 +
 compiler-utils/dependencies/runtimeClasspath.txt | 1 +
 compiler/build.gradle.kts                        | 1 +
 compiler/dependencies/runtimeClasspath.txt       | 1 +
 gradle/libs.versions.toml                        | 1 +
 7 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/compiler-api/build.gradle.kts b/compiler-api/build.gradle.kts
index 44d515cc2..e54caa858 100644
--- 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
index 442e871d1..2d2d33b55 100644
--- 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
index 7e9815c24..6de45a920 100644
--- 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
index 776733b9d..e29debed2 100644
--- 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
index 262b96180..f92566a93 100644
--- 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
index bcd9f4eea..63e592a25 100644
--- 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
index 2c43108d8..c19e25d35 100644
--- 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" }