Fix WORKSPACE setup for Bazel 8 / Bazel@HEAD

Googler · copybara-github · commit f2cfa789d898 · 2024-12-02T01:13:14.000-08:00
- Replaces `@protobuf` with `@com_google_protobuf`[^1] - Updates protobuf version to the latest release - Updates versions & moves declaration of `rules_python` and `rules_proto` before calling any setup macros to ensure we're on the right version. Work towards bazelbuild/bazel#23619 PiperOrigin-RevId: 701871997
diff --git a/WORKSPACE b/WORKSPACE
@@ -357,21 +357,35 @@ http_archive(
     sha256 = "1389206b2208c5f33a05dd96e51715b0855c480c082b7bb4889a8e07fcff536c",
 )
 
-_protobuf_version = "29.0-rc1"
+_protobuf_version = "29.0"
 
-_protobuf_sha256 = "32247eed6fa8c9792d2667b9fb306e8403736097226b478711d7f3bfece6fbda"
+_protobuf_sha256 = "10a0d58f39a1a909e95e00e8ba0b5b1dc64d02997f741151953a2b3659f6e78c"
 
 http_archive(
-    name = "protobuf",
+    name = "com_google_protobuf",
     sha256 = _protobuf_sha256,
     strip_prefix = "protobuf-%s" % _protobuf_version,
     urls = ["https://github.com/protocolbuffers/protobuf/archive/v%s.tar.gz" % _protobuf_version],
 )
 
+http_archive(
+    name = "rules_python",
+    sha256 = "690e0141724abb568267e003c7b6d9a54925df40c275a870a4d934161dc9dd53",
+    strip_prefix = "rules_python-0.40.0",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.40.0/rules_python-0.40.0.tar.gz",
+)
+
+http_archive(
+    name = "rules_proto",
+    sha256 = "0e5c64a2599a6e26c6a03d6162242d231ecc0de219534c38cb4402171def21e8",
+    strip_prefix = "rules_proto-7.0.2",
+    url = "https://github.com/bazelbuild/rules_proto/releases/download/7.0.2/rules_proto-7.0.2.tar.gz",
+)
+
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 rules_java_dependencies()
 
-load("@protobuf//:protobuf_deps.bzl", "protobuf_deps")
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 protobuf_deps()
 
 load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
@@ -565,13 +579,6 @@ new_git_repository(
     shallow_since = "1518210648 -0800",
 )
 
-http_archive(
-    name = "rules_python",
-    sha256 = "ffc7b877c95413c82bfd5482c017edcf759a6250d8b24e82f41f3c8b8d9e287e",
-    strip_prefix = "rules_python-0.19.0",
-    url = "https://github.com/bazelbuild/rules_python/releases/download/0.19.0/rules_python-0.19.0.tar.gz",
-)
-
 load("@rules_python//python:repositories.bzl", "py_repositories")
 
 py_repositories()
diff --git a/aspect/testing/rules/BUILD b/aspect/testing/rules/BUILD
@@ -1,7 +1,7 @@
 # Testing infrastructure for the plugin's Skylark aspect
 
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_binary", "java_library")
 load(
     "//:build-visibility.bzl",
@@ -32,7 +32,7 @@ java_binary(
         ":intellij_aspect_test_fixture_java_proto",
         "//aspect/testing:guava",
         "//proto:intellij_ide_info_java_proto",
-        "@protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java",
     ],
 )
 
@@ -74,7 +74,7 @@ java_binary(
         ":fast_build_aspect_test_fixture_java_proto",
         "//aspect/testing:guava",
         "//proto:fast_build_info_java_proto",
-        "@protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java",
     ],
 )
 
diff --git a/aspect/testing/tests/src/com/google/idea/blaze/aspect/proto/jpl/BUILD b/aspect/testing/tests/src/com/google/idea/blaze/aspect/proto/jpl/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library", "java_test")
 load(
     "//aspect/testing/rules:intellij_aspect_test_fixture.bzl",
diff --git a/proto/BUILD b/proto/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 load(
     "//:build-visibility.bzl",
@@ -130,7 +130,7 @@ java_library(
         "//third_party/bazel/src/main/protobuf:build_java_proto",
         "//third_party/bazel/src/main/protobuf:command_line_java_proto",
         "//third_party/bazel/src/main/protobuf:deps_java_proto",
-        "@protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java",
         "@rules_android//src/tools/deploy_info/proto:android_deploy_info_java_proto",
     ],
 )
diff --git a/querysync/java/com/google/idea/blaze/qsync/artifacts/BUILD b/querysync/java/com/google/idea/blaze/qsync/artifacts/BUILD
@@ -15,7 +15,7 @@ java_library(
         "//shared:exception",
         "//third_party/auto_value",
         "@com_google_guava_guava//jar",
+        "@com_google_protobuf//:protobuf_java",
         "@jsr305_annotations//jar",
-        "@protobuf//:protobuf_java",
     ],
 )
diff --git a/querysync/java/com/google/idea/blaze/qsync/cc/BUILD b/querysync/java/com/google/idea/blaze/qsync/cc/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = [
diff --git a/querysync/java/com/google/idea/blaze/qsync/deps/BUILD b/querysync/java/com/google/idea/blaze/qsync/deps/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 
 java_library(
@@ -22,8 +22,8 @@ java_library(
         "//shared:vcs",
         "//third_party/auto_value",
         "@com_google_guava_guava//jar",
+        "@com_google_protobuf//:protobuf_java",
         "@error_prone_annotations//jar",
-        "@protobuf//:protobuf_java",
     ],
 )
 
diff --git a/querysync/java/com/google/idea/blaze/qsync/java/BUILD b/querysync/java/com/google/idea/blaze/qsync/java/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = [
diff --git a/querysync/java/com/google/idea/blaze/qsync/project/BUILD b/querysync/java/com/google/idea/blaze/qsync/project/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = [
@@ -67,8 +67,8 @@ java_library(
         "//shared:vcs",
         "//third_party/auto_value",
         "@com_google_guava_guava//jar",
+        "@com_google_protobuf//:protobuf_java",
         "@error_prone_annotations//jar",
         "@jsr305_annotations//jar",
-        "@protobuf//:protobuf_java",
     ],
 )
diff --git a/querysync/java/com/google/idea/blaze/qsync/query/BUILD b/querysync/java/com/google/idea/blaze/qsync/query/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = [
diff --git a/querysync/java/com/google/idea/blaze/qsync/util/BUILD b/querysync/java/com/google/idea/blaze/qsync/util/BUILD
@@ -16,7 +16,7 @@ java_binary(
         "//querysync/java/com/google/idea/blaze/qsync/project",
         "//shared",
         "@com_google_guava_guava//jar",
-        "@protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java",
     ],
 )
 
diff --git a/querysync/javatests/com/google/idea/blaze/qsync/java/BUILD b/querysync/javatests/com/google/idea/blaze/qsync/java/BUILD
@@ -127,9 +127,9 @@ java_test(
         "//shared:artifact",
         "//shared/javatests/com/google/idea/blaze/common:test_utils",
         "@com_google_guava_guava//jar",
+        "@com_google_protobuf//:protobuf_java",
         "@junit//jar",
         "@mockito//jar",
-        "@protobuf//:protobuf_java",
         "@truth//jar",
     ],
 )
@@ -150,9 +150,9 @@ java_test(
         "//shared:artifact",
         "//shared/javatests/com/google/idea/blaze/common:test_utils",
         "@com_google_guava_guava//jar",
+        "@com_google_protobuf//:protobuf_java",
         "@junit//jar",
         "@mockito//jar",
-        "@protobuf//:protobuf_java",
         "@truth//jar",
     ],
 )
diff --git a/querysync/javatests/com/google/idea/blaze/qsync/project/BUILD b/querysync/javatests/com/google/idea/blaze/qsync/project/BUILD
@@ -55,8 +55,8 @@ java_test(
     deps = [
         "//querysync/java/com/google/idea/blaze/qsync/project",
         "//querysync/java/com/google/idea/blaze/qsync/project:language_class_java_proto",
+        "@com_google_protobuf//:protobuf_java",
         "@junit//jar",
-        "@protobuf//:protobuf_java",
         "@truth//jar",
     ],
 )
diff --git a/querysync/javatests/com/google/idea/blaze/qsync/testdata/grpc/BUILD b/querysync/javatests/com/google/idea/blaze/qsync/testdata/grpc/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 load("//third_party/java/grpc:build_defs.bzl", "java_grpc_library")
 
diff --git a/querysync/javatests/com/google/idea/blaze/qsync/testdata/nestedproto/BUILD b/querysync/javatests/com/google/idea/blaze/qsync/testdata/nestedproto/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 
 proto_library(
diff --git a/querysync/javatests/com/google/idea/blaze/qsync/testdata/protodep/BUILD b/querysync/javatests/com/google/idea/blaze/qsync/testdata/protodep/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 
 proto_library(
diff --git a/querysync/javatests/com/google/idea/blaze/qsync/testdata/protoonly/BUILD b/querysync/javatests/com/google/idea/blaze/qsync/testdata/protoonly/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 
 proto_library(
     name = "proto",
diff --git a/shared/java/com/google/idea/blaze/common/proto/BUILD b/shared/java/com/google/idea/blaze/common/proto/BUILD
@@ -7,6 +7,6 @@ java_library(
     deps = [
         "//shared/java/com/google/idea/blaze/common",
         "@com_google_guava_guava//jar",
-        "@protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java",
     ],
 )
diff --git a/shared/javatests/com/google/idea/blaze/common/proto/BUILD b/shared/javatests/com/google/idea/blaze/common/proto/BUILD
@@ -1,5 +1,5 @@
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_test")
 load("//:build-visibility.bzl", "DEFAULT_TEST_VISIBILITY")
 
@@ -25,8 +25,8 @@ java_test(
         ":test_java_proto",
         "//shared/java/com/google/idea/blaze/common/proto",
         "@com_google_guava_guava//jar",
+        "@com_google_protobuf//:protobuf_java",
         "@junit//jar",
-        "@protobuf//:protobuf_java",
         "@truth//jar",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ java_library(`
`15`	`15`	`"//shared:exception",`
`16`	`16`	`"//third_party/auto_value",`
`17`	`17`	`"@com_google_guava_guava//jar",`
	`18`	`+ "@com_google_protobuf//:protobuf_java",`
`18`	`19`	`"@jsr305_annotations//jar",`
`19`		`- "@protobuf//:protobuf_java",`
`20`	`20`	`],`
`21`	`21`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ java_binary(`
`16`	`16`	`"//querysync/java/com/google/idea/blaze/qsync/project",`
`17`	`17`	`"//shared",`
`18`	`18`	`"@com_google_guava_guava//jar",`
`19`		`- "@protobuf//:protobuf_java",`
	`19`	`+ "@com_google_protobuf//:protobuf_java",`
`20`	`20`	`],`
`21`	`21`	`)`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ java_library(`
`7`	`7`	`deps = [`
`8`	`8`	`"//shared/java/com/google/idea/blaze/common",`
`9`	`9`	`"@com_google_guava_guava//jar",`
`10`		`- "@protobuf//:protobuf_java",`
	`10`	`+ "@com_google_protobuf//:protobuf_java",`
`11`	`11`	`],`
`12`	`12`	`)`