Bump dependencies

- Update bazel_skylib to 1.8.2
- Update rules_java to 9.3.0
- Update bazel_features to 1.37.0
- Update protobuf to 33.1
- Update rules_jvm_external to 6.9
- Update rules_cc to 0.2.14

Author: agluszak

MODULE.bazel

@@ -11,15 +11,23 @@ proto_version_parts = proto_version.split(".")
 
 proto_module_version = ".".join(proto_version_parts[-2:])  # Last 2 parts
 
-bazel_dep(name = "protobuf", version = proto_module_version, repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto")
-bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
-bazel_dep(name = "rules_cc", version = "0.0.16")
-bazel_dep(name = "platforms", version = "0.0.11")
+bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "rules_java", version = "8.9.0")
-bazel_dep(name = "rules_python", version = "0.23.1")
+bazel_dep(name = "rules_java", version = "9.3.0")
 bazel_dep(name = "rules_android", version = "0.6.6")
+bazel_dep(name = "bazel_features", version = "1.37.0")
+bazel_dep(name = "protobuf", version = proto_module_version, repo_name = "com_google_protobuf")
+bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
+bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "bazel_worker_api", version = "0.0.8")
+bazel_dep(name = "bazel_worker_java", version = "0.0.8")
+
+# End of dependencies shared with MODULE.release.bazel
+bazel_dep(name = "rules_python", version = "1.6.0", dev_dependency = True)
+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
+
+# TODO[https://github.com/bazelbuild/rules_kotlin/issues/1395]: Update when fixed version is available.
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.1", dev_dependency = True)
 
 remote_android_extensions = use_extension(
     "@rules_android//bzlmod_extensions:android_extensions.bzl",
@@ -32,14 +40,6 @@ use_repo(android_sdk_repository_extension, "androidsdk")
 
 register_toolchains("@androidsdk//:all")
 
-bazel_dep(name = "bazel_features", version = "1.25.0")
-bazel_dep(name = "rules_shell", version = "0.4.1")
-bazel_dep(name = "bazel_worker_api", version = "0.0.8")
-bazel_dep(name = "bazel_worker_java", version = "0.0.8")
-
-# TODO[https://github.com/bazelbuild/rules_kotlin/issues/1395]: Update when fixed version is available.
-bazel_dep(name = "buildifier_prebuilt", version = "8.2.1", dev_dependency = True)
-
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")
 
@@ -62,11 +62,8 @@ register_toolchains("//src/main/starlark/core/compile/cli")
 register_toolchains("//kotlin/internal:default_toolchain")
 
 # Development dependencies
-# 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 = "6.6")
-bazel_dep(name = "bazel_ci_rules", version = "1.0.0")
+bazel_dep(name = "rules_jvm_external", version = "6.9", dev_dependency = True)
+bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
 
 rbe_preconfig = use_repo_rule("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
 
@@ -131,19 +128,18 @@ maven.override(
 )
 use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven")
 
-bazel_dep(name = "rules_pkg", version = "1.0.1")
-bazel_dep(name = "stardoc", version = "0.8.0", repo_name = "io_bazel_stardoc")
-
+bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True, repo_name = "io_bazel_stardoc")
 bazel_dep(name = "rules_testing", version = "0.9.0", dev_dependency = True)
 bazel_dep(name = "rules_bazel_integration_test", version = "0.34.0", dev_dependency = True)
 
 bazel_binaries = use_extension("@rules_bazel_integration_test//:extensions.bzl", "bazel_binaries", dev_dependency = True)
 bazel_binaries.download(version_file = "//:.bazelversion")
-bazel_binaries.download(version = "8.2.1")
+bazel_binaries.download(version = "8.4.2")
 use_repo(
     bazel_binaries,
     "bazel_binaries",
     "bazel_binaries_bazelisk",
     "build_bazel_bazel_.bazelversion",
-    "build_bazel_bazel_8_2_1",
+    "build_bazel_bazel_8_4_2",
 )

MODULE.release.bazel

@@ -5,15 +5,20 @@ module(
     repo_name = "rules_kotlin",
 )
 
-bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "rules_java", version = "8.9.0")
-bazel_dep(name = "rules_android", version = "0.6.4")
-bazel_dep(name = "bazel_features", version = "1.25.0")
-bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto")
+proto_version = "4.33.1"
+
+proto_version_parts = proto_version.split(".")
+
+proto_module_version = ".".join(proto_version_parts[-2:])  # Last 2 parts
+
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "rules_java", version = "9.3.0")
+bazel_dep(name = "rules_android", version = "0.6.6")
+bazel_dep(name = "bazel_features", version = "1.37.0")
+bazel_dep(name = "protobuf", version = proto_module_version, repo_name = "com_google_protobuf")
 bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
-bazel_dep(name = "rules_cc", version = "0.0.16")
+bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "bazel_worker_api", version = "0.0.8")
 bazel_dep(name = "bazel_worker_java", version = "0.0.8")
 

README.md

@@ -77,10 +77,22 @@ http_archive(
 load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
 kotlin_repositories() # if you want the default. Otherwise see custom kotlinc distribution below
 
+# Required: Initialize bazel_features (needed by rules_kotlin transitive dependencies)
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+bazel_features_deps()
+
+# Required: Initialize protobuf dependencies (creates proto_bazel_features repository
+# needed by rules_java's java:defs.bzl)
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+protobuf_deps()
+
 load("@rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
 kt_register_toolchains() # to use the default toolchain, otherwise see toolchains below
 ```
 
+**Note:** The `bazel_features_deps()` and `protobuf_deps()` calls are required to avoid
+WORKSPACE cycle errors with recent versions of rules_java and protobuf.
+
 ## `BUILD` files
 
 In your project's `BUILD` files, load the Kotlin rules and use them like so:
@@ -144,6 +156,9 @@ kotlin_repositories(
         sha256 = "a118197b0de55ffab2bc8d5cd03a5e39033cfb53383d6931bc761dec0784891a"
     )
 )
+
+# Don't forget to also call bazel_features_deps() and protobuf_deps() as shown
+# in the basic WORKSPACE setup above, followed by kt_register_toolchains()
 ```
 
 ## Third party dependencies 
@@ -336,6 +351,9 @@ kotlin_repositories(
         sha256 = "2ce5a08fddd20ef07ac051615905453fe08c3ba3ce5afa5dc43a9b77aa64507d",
     ),
 )
+
+# Don't forget to also call bazel_features_deps() and protobuf_deps() as shown
+# in the basic WORKSPACE setup above, followed by kt_register_toolchains()
 ```
 
 # Kotlin compiler plugins

examples/android/.bazelrc

@@ -1,6 +1,7 @@
 common --lockfile_mode=off
 test --test_output=all
 build --config=android_worker
+build --cxxopt="--std=c++17"
 
 # Worker configuration
 build:android_worker \

examples/android/WORKSPACE

@@ -37,7 +37,20 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
-# Android rules dependencies
+# kotlin_repositories must be called first to set up com_google_protobuf
+kotlin_repositories()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+# protobuf_deps() must be called BEFORE loading from @rules_java
+# to create proto_bazel_features repository
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
+# Android rules dependencies - must come AFTER protobuf_deps()
 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 
 rules_android_prereqs()
@@ -47,12 +60,6 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 
 rules_java_dependencies()
 
-# note that the following line is what is minimally required from protobuf for the java rules
-# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
-load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility
-
-proto_bazel_features(name = "proto_bazel_features")
-
 # register toolchains
 load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
 
@@ -82,8 +89,6 @@ register_toolchains(
     "@rules_android//toolchains/android_sdk:android_sdk_tools",
 )
 
-kotlin_repositories()
-
 load("@rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
 
 kt_register_toolchains()

examples/anvil/WORKSPACE

@@ -28,7 +28,20 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
-# Android rules dependencies
+# kotlin_repositories must be called first to set up com_google_protobuf
+kotlin_repositories()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+# protobuf_deps() must be called BEFORE loading from @rules_java
+# to create proto_bazel_features repository
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
+# Android rules dependencies - must come AFTER protobuf_deps()
 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 
 rules_android_prereqs()
@@ -38,12 +51,6 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 
 rules_java_dependencies()
 
-# note that the following line is what is minimally required from protobuf for the java rules
-# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
-load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility
-
-proto_bazel_features(name = "proto_bazel_features")
-
 # register toolchains
 load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
 
@@ -73,8 +80,6 @@ register_toolchains(
     "@rules_android//toolchains/android_sdk:android_sdk_tools",
 )
 
-kotlin_repositories()
-
 load("@rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
 
 kt_register_toolchains()

examples/associates/WORKSPACE

@@ -30,17 +30,21 @@ http_archive(
 
 kotlin_repositories()
 
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+# protobuf_deps() must be called to create proto_bazel_features repository
+# which is needed by rules_java's java:defs.bzl
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
 ##### rules_java setup for rules_android #####
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 
 rules_java_dependencies()
 
-# note that the following line is what is minimally required from protobuf for the java rules
-# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
-load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility
-
-proto_bazel_features(name = "proto_bazel_features")
-
 # register toolchains
 load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
 

examples/dagger/WORKSPACE

@@ -30,17 +30,21 @@ http_archive(
 
 kotlin_repositories()
 
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+# protobuf_deps() must be called to create proto_bazel_features repository
+# which is needed by rules_java's java:defs.bzl
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
 ##### rules_java setup for rules_android #####
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 
 rules_java_dependencies()
 
-# note that the following line is what is minimally required from protobuf for the java rules
-# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
-load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility
-
-proto_bazel_features(name = "proto_bazel_features")
-
 # register toolchains
 load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
 

examples/deps/WORKSPACE

@@ -28,7 +28,20 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
-# Android rules dependencies
+# kotlin_repositories must be called first to set up com_google_protobuf
+kotlin_repositories()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+# protobuf_deps() must be called BEFORE loading from @rules_java
+# to create proto_bazel_features repository
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
+# Android rules dependencies - must come AFTER protobuf_deps()
 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 
 rules_android_prereqs()
@@ -38,12 +51,6 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 
 rules_java_dependencies()
 
-# note that the following line is what is minimally required from protobuf for the java rules
-# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
-load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility
-
-proto_bazel_features(name = "proto_bazel_features")
-
 # register toolchains
 load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
 
@@ -75,7 +82,9 @@ register_toolchains(
     "@rules_android//toolchains/android_sdk:android_sdk_tools",
 )
 
-kotlin_repositories()
+load("@rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
+
+kt_register_toolchains()
 
 register_toolchains("//bzl:experimental_toolchain")
 

examples/multiplex/.bazelrc

@@ -2,4 +2,4 @@ build --worker_verbose
 build --worker_max_instances=1
 build --worker_quit_after_build
 build --profile=/tmp/profile.gz
-build --experimental_worker_max_multiplex_instances=KotlinCompile=5
+build --worker_max_multiplex_instances=KotlinCompile=5