Enable --incompatible_disallow_empty_glob by default

.bazelci/presubmit.yml

@@ -2,10 +2,8 @@
 matrix:
   unittest_platform:
     - ubuntu2004
-    - ubuntu1804
   integration_platform:
     - ubuntu2004
-    - ubuntu1804
     # - macos
     # - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
   test_flags:
@@ -35,7 +33,9 @@ tasks:
       - "--config=rbe"
     test_targets:
       - //examples:all
-  rbe_ubuntu1604:
+  rbe_ubuntu2004:
+    platform: ubuntu2004
+    name: "RBE"
     test_targets:
       - "--"
       - "//src/test/kotlin/io/bazel/kotlin/builder:builder_tests"
@@ -50,7 +50,7 @@ tasks:
       - "--strategy=KotlinCompile=remote"
   stardoc:
     name: Stardoc api documentation
-    platform: ubuntu1804
+    platform: ubuntu2004
     build_flags:
       - "--enable_bzlmod=true"
     build_targets:
@@ -59,7 +59,7 @@ tasks:
       - //docs:are_docs_up_to_date_test
   ktlint:
     name: KtLint
-    platform: ubuntu1804
+    platform: ubuntu2004
     test_targets:
       - //...
     test_flags:

.bazelrc

@@ -12,8 +12,10 @@ build --verbose_failures
 # Required for windows ci
 startup --windows_enable_symlinks
 common --enable_runfiles
+# Newer versions of Bazel enable this by default
+common --incompatible_disallow_empty_glob
 
 try-import %workspace%/bit-ignore.bazelrc
 
 # User-specific .bazelrc
-try-import %workspace%/user.bazelrc
+try-import %workspace%/user.bazelrc

MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "rules_kotlin",
-    version = "1.8.1",
+    version = "2.1.0",
     compatibility_level = 1,
     repo_name = "rules_kotlin",
 )
@@ -36,7 +36,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
 # TODO(bencodes) A bunch of these dependencies need to be marked as dev_dependencies but before we can do that
 # we need to sort out a few cases around how these rules are consumed in various ways.
 
-bazel_dep(name = "rules_jvm_external", version = "5.3")
+bazel_dep(name = "rules_jvm_external", version = "6.3")
 bazel_dep(name = "bazel_ci_rules", version = "1.0.0")
 
 rbe_preconfig = use_repo_rule("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
@@ -52,8 +52,6 @@ maven.install(
     artifacts = [
         "com.google.code.findbugs:jsr305:3.0.2",
         "junit:junit:4.13-beta-3",
-        "com.google.protobuf:protobuf-java:3.6.0",
-        "com.google.protobuf:protobuf-java-util:3.6.0",
         "com.google.guava:guava:27.1-jre",
         "com.google.truth:truth:0.45",
         "com.google.auto.service:auto-service:1.1.1",
@@ -98,9 +96,9 @@ maven.override(
 )
 use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven")
 
-bazel_dep(name = "rules_pkg", version = "0.7.0")
-bazel_dep(name = "stardoc", version = "0.7.0", repo_name = "io_bazel_stardoc")
-bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
+bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "stardoc", version = "0.7.2", repo_name = "io_bazel_stardoc")
 
 bazel_dep(name = "rules_testing", version = "0.5.0", dev_dependency = True)
 bazel_dep(name = "rules_bazel_integration_test", version = "0.25.0", dev_dependency = True)

kotlin/BUILD

@@ -1,5 +1,3 @@
-load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
-
 # Copyright 2018 The Bazel Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,7 @@ load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
 load("//src/main/starlark/release:packager.bzl", "release_archive")
 
 release_archive(

kotlin/compiler/BUILD.release.bazel

@@ -28,6 +28,5 @@ bzl_library(
     name = "compiler",
     srcs = glob(["*.bzl"]),
     deps = [
-        "@rules_proto//proto:repositories",
     ],
 )

kotlin/internal/BUILD

@@ -46,5 +46,6 @@ bzl_library(
         "//src/main/starlark/core/compile",
         "//src/main/starlark/core/options",
         "@rules_java//java:rules",
+        "@rules_java//java/private:proto_support",
     ],
 )

kotlin_rules_maven_install.json

@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -788868969,
-  "__RESOLVED_ARTIFACTS_HASH": 1873973417,
+  "__INPUT_ARTIFACTS_HASH": -2064659652,
+  "__RESOLVED_ARTIFACTS_HASH": 30072322,
   "conflict_resolution": {
     "com.google.guava:guava:27.1-jre": "com.google.guava:guava:33.2.1-jre"
   },
@@ -48,13 +48,6 @@
       },
       "version": "3.0.2"
     },
-    "com.google.code.gson:gson": {
-      "shasums": {
-        "jar": "2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32",
-        "sources": "2d3220d5d936f0a26258aa3b358160741a4557e046a001251e5799c2db0f0d74"
-      },
-      "version": "2.7"
-    },
     "com.google.dagger:dagger": {
       "shasums": {
         "jar": "19680b0f42baa7f9414dacae8663244d323d084a6ee5594ad115a17f3be37c05",
@@ -139,20 +132,6 @@
       },
       "version": "3.0.0"
     },
-    "com.google.protobuf:protobuf-java": {
-      "shasums": {
-        "jar": "8c8a65be83e75ccdcaa21417e303025f1708ea01e8c0a05d6c770e64b6c09ea1",
-        "sources": "88411bb0333725b27bf53ed4d95785f6f4b541e22e1e27c60c2be8b3115fc5c4"
-      },
-      "version": "3.6.0"
-    },
-    "com.google.protobuf:protobuf-java-util": {
-      "shasums": {
-        "jar": "ad7f8d67674906ce88077fbb233b427b7068991a61af42ce9301990bdf8f3605",
-        "sources": "a2959842caed6f0b1dbecfaf0e73ef03117416f967c0532c32d092b6e2b98d60"
-      },
-      "version": "3.6.0"
-    },
     "com.google.truth:truth": {
       "shasums": {
         "jar": "0f7dced2a16e55a77e44fc3ff9c5be98d4bf4bb30abc18d78ffd735df950a69f",
@@ -536,11 +515,6 @@
       "com.google.j2objc:j2objc-annotations",
       "org.checkerframework:checker-qual"
     ],
-    "com.google.protobuf:protobuf-java-util": [
-      "com.google.code.gson:gson",
-      "com.google.guava:guava",
-      "com.google.protobuf:protobuf-java"
-    ],
     "com.google.truth:truth": [
       "com.google.auto.value:auto-value-annotations",
       "com.google.errorprone:error_prone_annotations",
@@ -655,9 +629,6 @@
       "org.ow2.asm:asm-commons"
     ]
   },
-  "skipped": [
-    "com.google.guava:listenablefuture:jar:sources"
-  ],
   "packages": {
     "com.google.auto.service:auto-service": [
       "com.google.auto.service.processor"
@@ -750,15 +721,6 @@
       "javax.annotation.concurrent",
       "javax.annotation.meta"
     ],
-    "com.google.code.gson:gson": [
-      "com.google.gson",
-      "com.google.gson.annotations",
-      "com.google.gson.internal",
-      "com.google.gson.internal.bind",
-      "com.google.gson.internal.bind.util",
-      "com.google.gson.reflect",
-      "com.google.gson.stream"
-    ],
     "com.google.dagger:dagger": [
       "dagger",
       "dagger.assisted",
@@ -913,13 +875,6 @@
     "com.google.j2objc:j2objc-annotations": [
       "com.google.j2objc.annotations"
     ],
-    "com.google.protobuf:protobuf-java": [
-      "com.google.protobuf",
-      "com.google.protobuf.compiler"
-    ],
-    "com.google.protobuf:protobuf-java-util": [
-      "com.google.protobuf.util"
-    ],
     "com.google.truth:truth": [
       "com.google.common.truth"
     ],
@@ -1463,8 +1418,6 @@
       "com.google.auto:auto-common:jar:sources",
       "com.google.code.findbugs:jsr305",
       "com.google.code.findbugs:jsr305:jar:sources",
-      "com.google.code.gson:gson",
-      "com.google.code.gson:gson:jar:sources",
       "com.google.dagger:dagger",
       "com.google.dagger:dagger-compiler",
       "com.google.dagger:dagger-compiler:jar:sources",
@@ -1488,10 +1441,6 @@
       "com.google.guava:listenablefuture",
       "com.google.j2objc:j2objc-annotations",
       "com.google.j2objc:j2objc-annotations:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java-util",
-      "com.google.protobuf:protobuf-java-util:jar:sources",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.google.truth:truth",
       "com.google.truth:truth:jar:sources",
       "com.googlecode.java-diff-utils:diffutils",
@@ -1598,8 +1547,6 @@
       "com.google.auto:auto-common:jar:sources",
       "com.google.code.findbugs:jsr305",
       "com.google.code.findbugs:jsr305:jar:sources",
-      "com.google.code.gson:gson",
-      "com.google.code.gson:gson:jar:sources",
       "com.google.dagger:dagger",
       "com.google.dagger:dagger-compiler",
       "com.google.dagger:dagger-compiler:jar:sources",
@@ -1623,10 +1570,6 @@
       "com.google.guava:listenablefuture",
       "com.google.j2objc:j2objc-annotations",
       "com.google.j2objc:j2objc-annotations:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java-util",
-      "com.google.protobuf:protobuf-java-util:jar:sources",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.google.truth:truth",
       "com.google.truth:truth:jar:sources",
       "com.googlecode.java-diff-utils:diffutils",
@@ -1733,8 +1676,6 @@
       "com.google.auto:auto-common:jar:sources",
       "com.google.code.findbugs:jsr305",
       "com.google.code.findbugs:jsr305:jar:sources",
-      "com.google.code.gson:gson",
-      "com.google.code.gson:gson:jar:sources",
       "com.google.dagger:dagger",
       "com.google.dagger:dagger-compiler",
       "com.google.dagger:dagger-compiler:jar:sources",
@@ -1758,10 +1699,6 @@
       "com.google.guava:listenablefuture",
       "com.google.j2objc:j2objc-annotations",
       "com.google.j2objc:j2objc-annotations:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java-util",
-      "com.google.protobuf:protobuf-java-util:jar:sources",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.google.truth:truth",
       "com.google.truth:truth:jar:sources",
       "com.googlecode.java-diff-utils:diffutils",
@@ -1856,5 +1793,91 @@
       "org.pantsbuild:jarjar:jar:sources"
     ]
   },
+  "services": {
+    "com.google.auto.service:auto-service": {
+      "javax.annotation.processing.Processor": [
+        "com.google.auto.service.processor.AutoServiceProcessor"
+      ]
+    },
+    "com.google.auto.service:auto-service:jar:sources": {
+      "javax.annotation.processing.Processor": [
+        "com.google.auto.service.processor.AutoServiceProcessor"
+      ]
+    },
+    "com.google.auto.value:auto-value": {
+      "autovalue.shaded.kotlinx.metadata.impl.extensions.MetadataExtensions": [
+        "autovalue.shaded.kotlinx.metadata.jvm.impl.JvmMetadataExtensions"
+      ],
+      "com.google.auto.value.extension.AutoValueExtension": [
+        "com.google.auto.value.extension.memoized.processor.MemoizeExtension",
+        "com.google.auto.value.extension.serializable.processor.SerializableAutoValueExtension",
+        "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringExtension"
+      ],
+      "com.google.auto.value.extension.serializable.serializer.interfaces.SerializerExtension": [
+        "com.google.auto.value.extension.serializable.serializer.impl.ImmutableListSerializerExtension",
+        "com.google.auto.value.extension.serializable.serializer.impl.ImmutableMapSerializerExtension",
+        "com.google.auto.value.extension.serializable.serializer.impl.OptionalSerializerExtension"
+      ],
+      "javax.annotation.processing.Processor": [
+        "com.google.auto.value.extension.memoized.processor.MemoizedValidator",
+        "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringValidator",
+        "com.google.auto.value.processor.AutoAnnotationProcessor",
+        "com.google.auto.value.processor.AutoBuilderProcessor",
+        "com.google.auto.value.processor.AutoOneOfProcessor",
+        "com.google.auto.value.processor.AutoValueBuilderProcessor",
+        "com.google.auto.value.processor.AutoValueProcessor"
+      ]
+    },
+    "com.google.dagger:dagger-compiler": {
+      "com.google.devtools.ksp.processing.SymbolProcessorProvider": [
+        "dagger.internal.codegen.KspComponentProcessor$Provider"
+      ],
+      "javax.annotation.processing.Processor": [
+        "dagger.internal.codegen.ComponentProcessor"
+      ]
+    },
+    "com.google.dagger:dagger-spi": {
+      "dagger.spi.internal.shaded.androidx.room.jarjarred.kotlin.metadata.internal.extensions.MetadataExtensions": [
+        "dagger.spi.internal.shaded.androidx.room.jarjarred.kotlin.metadata.jvm.internal.JvmMetadataExtensions"
+      ],
+      "dagger.spi.internal.shaded.kotlin.metadata.internal.extensions.MetadataExtensions": [
+        "dagger.spi.internal.shaded.kotlin.metadata.jvm.internal.JvmMetadataExtensions"
+      ]
+    },
+    "com.squareup.moshi:moshi-kotlin-codegen": {
+      "com.google.devtools.ksp.processing.SymbolProcessorProvider": [
+        "com.squareup.moshi.kotlin.codegen.ksp.JsonClassSymbolProcessorProvider"
+      ],
+      "com.squareup.moshi.kotlinx.metadata.internal.extensions.MetadataExtensions": [
+        "com.squareup.moshi.kotlinx.metadata.jvm.internal.JvmMetadataExtensions"
+      ],
+      "javax.annotation.processing.Processor": [
+        "com.squareup.moshi.kotlin.codegen.apt.JsonClassCodegenProcessor"
+      ]
+    },
+    "dev.zacsweers.autoservice:auto-service-ksp": {
+      "com.google.devtools.ksp.processing.SymbolProcessorProvider": [
+        "dev.zacsweers.autoservice.ksp.AutoServiceSymbolProcessor$Provider"
+      ]
+    },
+    "org.eclipse.sisu:org.eclipse.sisu.inject": {
+      "javax.annotation.processing.Processor": [
+        "org.eclipse.sisu.space.SisuIndexAPT6"
+      ]
+    },
+    "org.jetbrains.kotlin:kotlin-reflect": {
+      "kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoader": [
+        "kotlin.reflect.jvm.internal.impl.serialization.deserialization.builtins.BuiltInsLoaderImpl"
+      ],
+      "kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition": [
+        "kotlin.reflect.jvm.internal.impl.load.java.ErasedOverridabilityCondition",
+        "kotlin.reflect.jvm.internal.impl.load.java.FieldOverridabilityCondition",
+        "kotlin.reflect.jvm.internal.impl.load.java.JavaIncompatibilityRulesOverridabilityCondition"
+      ]
+    }
+  },
+  "skipped": [
+    "com.google.guava:listenablefuture:jar:sources"
+  ],
   "version": "2"
 }

src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel

@@ -32,8 +32,8 @@ kt_bootstrap_library(
         "//src/main/protobuf:deps_java_proto",
         "//src/main/protobuf:kotlin_model_java_proto",
         "//src/main/protobuf:worker_protocol_java_proto",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
+        "@com_google_protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java_util",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
     ],
 )

src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel

@@ -31,8 +31,8 @@ kt_bootstrap_library(
         "//src/main/kotlin/io/bazel/kotlin/plugin:skip-code-gen-lib",
         "//src/main/kotlin/io/bazel/kotlin/plugin/jdeps:jdeps-gen-lib",
         "//src/main/protobuf:kotlin_model_java_proto",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
+        "@com_google_protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java_util",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
     ],
 )

src/main/kotlin/io/bazel/kotlin/builder/toolchain/CompilationTaskContext.kt

@@ -93,7 +93,7 @@ class CompilationTaskContext(
     header: String,
     msg: MessageOrBuilder,
   ) {
-    printLines(header, TextFormat.printToString(msg).split("\n"), filterEmpty = true)
+    printLines(header, TextFormat.printer().printToString(msg).split("\n"), filterEmpty = true)
   }
 
   /**