v8.0.0-rc2

drop MODULE.tools workaround
bazelbuild · Oct 4, 2024 · 1204415 · 1204415
1 parent 78b07fa
commit 1204415
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -24,7 +24,7 @@ bazel_dep(name = "zstd-jni", version = "1.5.2-3.bcr.1")
 bazel_dep(name = "blake3", version = "1.5.1.bcr.1")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
 bazel_dep(name = "rules_cc", version = "0.0.10")
-bazel_dep(name = "rules_java", version = "8.0.0-rc1")
+bazel_dep(name = "rules_java", version = "8.0.0-rc2")
 bazel_dep(name = "rules_graalvm", version = "0.11.1")
 bazel_dep(name = "rules_proto", version = "6.0.2")
 bazel_dep(name = "rules_jvm_external", version = "6.0")

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/src/MODULE.tools b/src/MODULE.tools
@@ -48,7 +48,7 @@ use_repo(buildozer_binary, "buildozer_binary")
 # Dependencies used to auto-load removed symbols and rules from Bazel (due to Starlarkification)
 # See also: --incompatible_autoload_externally, AutoloadSymbols
 bazel_dep(name = "protobuf", version = "27.0", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_java", version = "8.0.0-rc1")
+bazel_dep(name = "rules_java", version = "8.0.0-rc2")
 bazel_dep(name = "rules_cc", version = "0.0.10")
 bazel_dep(name = "rules_python", version = "0.36.0")
 # add rules_android

diff --git a/src/test/tools/bzlmod/MODULE.bazel.lock b/src/test/tools/bzlmod/MODULE.bazel.lock
diff --git a/src/test/tools/bzlmod/update_default_lock_file.sh b/src/test/tools/bzlmod/update_default_lock_file.sh
@@ -35,9 +35,7 @@ function generate_lock_file() {
  trap 'cleanup $tmpdir' EXIT
 
  cd "${tmpdir}"
- cat > MODULE.bazel <<EOF
-single_version_override(module_name = "protobuf", version = "27.0")
-EOF
+ touch MODULE.bazel
  echo 'common --incompatible_use_plus_in_repo_names' > .bazelrc
  bazel=$(rlocation io_bazel/src/bazel)
 

diff --git a/workspace_deps.bzl b/workspace_deps.bzl
@@ -25,9 +25,9 @@ WORKSPACE_REPOS = {
  "strip_prefix": "rules_cc-0.0.10",
  },
  "rules_java": {
- "archive": "rules_java-7.12.1.tar.gz",
- "sha256": "dfbadbb37a79eb9e1cc1e156ecb8f817edf3899b28bc02410a6c1eb88b1a6862",
- "urls": ["https://github.com/bazelbuild/rules_java/releases/download/7.12.1/rules_java-7.12.1.tar.gz"],
+ "archive": "rules_java-8.0.0-rc2.tar.gz",
+ "sha256": "7bfdbb51bb362ecdca5d989efa3c77683ce4d431e82e2d2d7aadca33a8c35ca7",
+ "urls": ["https://github.com/bazelbuild/rules_java/releases/download/8.0.0-rc2/rules_java-8.0.0-rc2.tar.gz"],
  },
  "bazel_skylib": {
  "archive": "bazel-skylib-1.6.1.tar.gz",