Upgrade to C++ 17, Bazel 7.6.1 (LTS), Java 17, and bzlmod.

duckladydinh · duckladydinh · commit 5221b85727a5 · 2025-04-13T16:02:20.000Z
diff --git a/.bazelrc b/.bazelrc
@@ -1 +1 @@
-build --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
+build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.3.2
+7.6.1
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ build
 local.properties
 *.iml
 /bazel-*
+MODULE.bazel.lock
+*/bin/*
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -0,0 +1,33 @@
+module(
+    name = "com_github_grpc_grpc_kotlin",
+    version = "2.1.0",
+)
+
+bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "30.2")
+bazel_dep(name = "rules_kotlin", repo_name = "io_bazel_rules_kotlin", version = "2.1.3")
+bazel_dep(name = "rules_java", version = "8.11.0")
+bazel_dep(name = "rules_jvm_external", version = "6.7")
+bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java", version = "1.71.0")
+
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+maven.install(
+    # Rerun whenever adding new artifacts.
+    # $ REPIN=1 bazelisk run @maven//:pin
+    artifacts = [
+        "com.google.jimfs:jimfs:1.3.0",
+        "com.google.truth:truth:1.4.2",
+        "com.google.truth.extensions:truth-proto-extension:1.4.2",
+        "com.google.protobuf:protobuf-java:4.30.2",
+        "com.google.protobuf:protobuf-kotlin:4.30.2",
+        "com.google.guava:guava:33.3.1-android",
+        "com.squareup:kotlinpoet:1.14.2",
+        "junit:junit:4.13.2",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1",
+    ],
+    fetch_sources = False,
+    lock_file = "//:maven_install.json",
+    generate_compat_repositories = True,
+    strict_visibility = True,
+)
+use_repo(maven, "maven")
diff --git a/WORKSPACE b/WORKSPACE
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -40,14 +40,14 @@ subprojects {
     version = rootProject.version
 
     tasks.withType<JavaCompile> {
-        sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-        targetCompatibility = JavaVersion.VERSION_1_8.toString()
+        sourceCompatibility = JavaVersion.VERSION_17.toString()
+        targetCompatibility = JavaVersion.VERSION_17.toString()
     }
 
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             freeCompilerArgs = listOf("-Xjsr305=strict")
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+            jvmTarget = JavaVersion.VERSION_17.toString()
         }
     }
 
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
@@ -11,7 +11,7 @@ application {
 java {
     withSourcesJar()
     toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
@@ -34,7 +34,6 @@ dependencies {
     testImplementation(libs.jimfs)
     testImplementation(libs.protobuf.gradle.plugin)
     testImplementation(libs.protobuf.java)
-    testImplementation(libs.mockito.kotlin)
     testImplementation(libs.junit.jupiter.engine)
     testImplementation(libs.mockito.core)
 }
diff --git a/compiler/src/main/java/io/grpc/kotlin/generator/BUILD.bazel b/compiler/src/main/java/io/grpc/kotlin/generator/BUILD.bazel
@@ -13,9 +13,9 @@ kt_jvm_library(
         "//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
         "//stub/src/main/java/io/grpc/kotlin:context",
         "//stub/src/main/java/io/grpc/kotlin:stub",
-        "@com_google_guava_guava",
         "@com_google_protobuf//:protobuf_java",
         "@io_grpc_grpc_java//core",
+        "@maven//:com_google_guava_guava",
         "@maven//:com_squareup_kotlinpoet",
         "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
     ],
diff --git a/compiler/src/main/java/io/grpc/kotlin/generator/protoc/BUILD.bazel b/compiler/src/main/java/io/grpc/kotlin/generator/protoc/BUILD.bazel
@@ -11,8 +11,8 @@ kt_jvm_library(
     srcs = glob(["*.kt"]),
     deps = [
         "//compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph",
-        "@com_google_guava_guava",
         "@com_google_protobuf//:protobuf_java",
+        "@maven//:com_google_guava_guava",
         "@maven//:com_squareup_kotlinpoet",
     ],
 )
diff --git a/compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph/BUILD.bazel b/compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph/BUILD.bazel
@@ -11,6 +11,6 @@ kt_jvm_library(
     srcs = ["TopologicalSortGraph.kt"],
     deps = [
         "//compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/sort",
-        "@com_google_guava_guava//:com_google_guava_guava",
+        "@maven//:com_google_guava_guava",
     ],
 )
diff --git a/compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph/TopologicalSortGraph.kt b/compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph/TopologicalSortGraph.kt
@@ -23,7 +23,7 @@ import io.grpc.kotlin.generator.protoc.util.sort.TopologicalSort.sortLexicograph
 
 @Beta
 object TopologicalSortGraph {
-    fun <N> topologicalOrdering(graph: Graph<N>): List<N> {
+    fun <N: Any> topologicalOrdering(graph: Graph<N>): List<N> {
         checkArgument(graph.isDirected, "Cannot get topological ordering of an undirected graph.")
         val partialOrdering: PartialOrdering<N> = object : PartialOrdering<N> {
             override fun getPredecessors(element: N): Set<N> = element?.let {
diff --git a/examples/android/build.gradle.kts b/examples/android/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(17)
 }
 
 android {
diff --git a/examples/client/build.gradle.kts b/examples/client/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(17)
 }
 
 dependencies {
diff --git a/examples/gradle/libs.versions.toml b/examples/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [plugins]
 android-application = { id = "com.android.application", version = "8.3.0" }
 android-library = { id = "com.android.library", version = "8.3.0" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.23" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "1.9.23" }
-protobuf = { id = "com.google.protobuf", version = "0.9.4" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.1.20" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.1.20" }
+protobuf = { id = "com.google.protobuf", version = "0.9.5" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.1.0" }
 palantir-graal = { id = "com.palantir.graal", version = "0.12.0" }
 jib = { id = "com.google.cloud.tools.jib", version = "3.4.1" }
diff --git a/examples/server/build.gradle.kts b/examples/server/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(17)
 }
 
 dependencies {
diff --git a/examples/stub-android/build.gradle.kts b/examples/stub-android/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(17)
 }
 
 android {
diff --git a/examples/stub-lite/build.gradle.kts b/examples/stub-lite/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(17)
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
diff --git a/examples/stub/build.gradle.kts b/examples/stub/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(17)
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,16 +1,15 @@
 [plugins]
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.8.0" }
-protobuf = { id = "com.google.protobuf", version = "0.9.4" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.1.20" }
+protobuf = { id = "com.google.protobuf", version = "0.9.5" }
 test-retry = { id = "org.gradle.test-retry", version = "1.5.7" }
-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
-dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
+publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }
+dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
 qoomon-git-versioning = { id = "me.qoomon.git-versioning", version = "6.4.3" }
 kotlin-power-assert = { id = "com.bnorm.power.kotlin-power-assert", version = "0.13.0" }
 
 [libraries]
-kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.0" }
-kotlinx-coroutines-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version = "1.8.0" }
-kotlinx-coroutines-debug = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-debug", version = "1.8.0" }
+kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" }
+kotlinx-coroutines-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version = "1.10.1" }
 grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf", version = "1.62.2" }
 grpc-protobuf-lite = { group = "io.grpc", name = "grpc-protobuf-lite", version = "1.62.2" }
 grpc-alts = { group = "io.grpc", name = "grpc-alts", version = "1.62.2" }
@@ -26,11 +25,10 @@ junit = { group = "junit", name = "junit", version = "4.13.2" }
 junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version = "1.10.2" }
 guava = { group = "com.google.guava", name = "guava", version = "33.0.0-jre" }
 jimfs = { group = "com.google.jimfs", name = "jimfs", version = "1.3.0" }
-protobuf-gradle-plugin = { group = "com.google.protobuf", name = "protobuf-gradle-plugin", version = "0.9.4" }
-mockito-kotlin = { group = "com.nhaarman.mockitokotlin2", name = "mockito-kotlin", version = "2.2.0" }
+protobuf-gradle-plugin = { group = "com.google.protobuf", name = "protobuf-gradle-plugin", version = "0.9.5" }
 junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.10.2" }
 junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version = "5.10.2" }
-mockito-core = { group = "org.mockito", name = "mockito-core", version = "4.11.0" }
+mockito-core = { group = "org.mockito", name = "mockito-core", version = "5.17.0" }
 protoc = { group = "com.google.protobuf", name = "protoc", version = "3.25.3" }
 protobuf-java = { group = "com.google.protobuf", name = "protobuf-java", version = "3.25.3" }
 truth = { group = "com.google.truth", name = "truth", version = "1.4.2" }
diff --git a/maven_install.json b/maven_install.json
diff --git a/repositories.bzl b/repositories.bzl
diff --git a/stub/build.gradle.kts b/stub/build.gradle.kts
diff --git a/stub/src/test/java/io/grpc/kotlin/AbstractCallsTest.kt b/stub/src/test/java/io/grpc/kotlin/AbstractCallsTest.kt
diff --git a/stub/src/test/java/io/grpc/kotlin/BUILD.bazel b/stub/src/test/java/io/grpc/kotlin/BUILD.bazel

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-build --cxxopt=-std=c++14 --host_cxxopt=-std=c++14`
	`1`	`+build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,14 @@ subprojects {`
`40`	`40`	`version = rootProject.version`
`41`	`41`
`42`	`42`	`tasks.withType<JavaCompile> {`
`43`		`- sourceCompatibility = JavaVersion.VERSION_1_8.toString()`
`44`		`- targetCompatibility = JavaVersion.VERSION_1_8.toString()`
	`43`	`+ sourceCompatibility = JavaVersion.VERSION_17.toString()`
	`44`	`+ targetCompatibility = JavaVersion.VERSION_17.toString()`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`tasks.withType<KotlinCompile> {`
`48`	`48`	`kotlinOptions {`
`49`	`49`	`freeCompilerArgs = listOf("-Xjsr305=strict")`
`50`		`- jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`50`	`+ jvmTarget = JavaVersion.VERSION_17.toString()`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ application {`
`11`	`11`	`java {`
`12`	`12`	`withSourcesJar()`
`13`	`13`	`toolchain {`
`14`		`- languageVersion = JavaLanguageVersion.of(8)`
	`14`	`+ languageVersion = JavaLanguageVersion.of(17)`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`@@ -34,7 +34,6 @@ dependencies {`
`34`	`34`	`testImplementation(libs.jimfs)`
`35`	`35`	`testImplementation(libs.protobuf.gradle.plugin)`
`36`	`36`	`testImplementation(libs.protobuf.java)`
`37`		`- testImplementation(libs.mockito.kotlin)`
`38`	`37`	`testImplementation(libs.junit.jupiter.engine)`
`39`	`38`	`testImplementation(libs.mockito.core)`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ kt_jvm_library(`
`11`	`11`	`srcs = ["TopologicalSortGraph.kt"],`
`12`	`12`	`deps = [`
`13`	`13`	`"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/sort",`
`14`		`- "@com_google_guava_guava//:com_google_guava_guava",`
	`14`	`+ "@maven//:com_google_guava_guava",`
`15`	`15`	`],`
`16`	`16`	`)`