Drop support for workspace-based builds (#321)

bazel-contrib · Feb 7, 2025 · ec85c7b · ec85c7b
1 parent f392b39
commit ec85c7b
Show file tree

Hide file tree

Showing 43 changed files with 1,098 additions and 1,330 deletions.
diff --git a/.github/workflows/workspace_based.yaml b/.github/workflows/workspace_based.yaml
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,5 +1,4 @@
 load("@bazel_gazelle//:def.bzl", "DEFAULT_LANGUAGES", "gazelle", "gazelle_binary")
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
 
 buildifier(
@@ -47,33 +46,3 @@ gazelle_binary(
 gazelle(
     name = "gazelle_go",
 )
-
-bzl_library(
-    name = "repositories",
-    srcs = ["repositories.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//java/private:zip_repository",
-        "@bazel_tools//tools/build_defs/repo:http.bzl",
-        "@bazel_tools//tools/build_defs/repo:utils.bzl",
-    ],
-)
-
-bzl_library(
-    name = "setup",
-    srcs = ["setup.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@apple_rules_lint//lint:implementation",
-        "@contrib_rules_jvm_deps//:defs",
-    ],
-)
-
-bzl_library(
-    name = "gazelle_setup",
-    srcs = ["gazelle_setup.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//third_party/go:repositories",
-    ],
-)
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -11,65 +11,19 @@ PROTOBUF_VERSION = "21.7"
 # The java packages are published to maven under a different versioning scheme.
 PROTOBUF_JAVA_VERSION = "3.{}".format(PROTOBUF_VERSION)
 
-bazel_dep(
-    name = "apple_rules_lint",
-    version = "0.4.0",
-)
-bazel_dep(
-    name = "bazel_skylib",
-    version = "1.7.1",
-)
-
-bazel_dep(
-    name = "bazel_skylib_gazelle_plugin",
-    version = "1.7.1",
-    dev_dependency = True,
-)
-
-bazel_dep(
-    name = "gazelle",
-    version = "0.39.1",
-    repo_name = "bazel_gazelle",
-)
-bazel_dep(
-    name = "protobuf",
-    version = "27.2",
-    repo_name = "com_google_protobuf",
-)
-bazel_dep(
-    name = "rules_cc",
-    version = "0.0.11",
-)
-bazel_dep(
-    name = "rules_go",
-    version = "0.50.1",
-    repo_name = "io_bazel_rules_go",
-)
-bazel_dep(
-    name = "rules_java",
-    version = "7.12.1",
-)
-bazel_dep(
-    name = "rules_jvm_external",
-    version = "6.6",
-)
-bazel_dep(
-    name = "rules_proto",
-    version = "6.0.2",
-)
-
-bazel_dep(
-    name = "stardoc",
-    version = "0.7.1",
-    dev_dependency = True,
-    repo_name = "io_bazel_stardoc",
-)
-
-non_module_deps = use_extension("//java/private:non-module-deps.bzl", "non_module_deps")
-use_repo(
-    non_module_deps,
-    "io_grpc_grpc_java",
-)
+bazel_dep(name = "apple_rules_lint", version = "0.4.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "grpc-java", version = "1.69.0")
+bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "rules_cc", version = "0.0.16")
+bazel_dep(name = "rules_go", version = "0.52.0")
+bazel_dep(name = "rules_java", version = "7.12.2")
+bazel_dep(name = "rules_jvm_external", version = "6.6")
+bazel_dep(name = "rules_proto", version = "7.0.2")
+
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
 
 linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
 linter.register(name = "java-checkstyle")
@@ -246,8 +200,8 @@ use_repo(
     "contrib_rules_jvm_tests",
 )
 
-go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.21.5")
+go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
+go_sdk.download(version = "1.23.6")
 
 go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")

diff --git a/examples/gazelle/.bazelversion b/examples/gazelle/.bazelversion
@@ -0,0 +1 @@
+../../.bazelversion
diff --git a/examples/gazelle/MODULE.bazel b/examples/gazelle/MODULE.bazel
@@ -3,23 +3,15 @@ module(
     version = "0.0.0",
 )
 
-bazel_dep(
-    name = "contrib_rules_jvm",
-    version = "0.0.0",
-)
+bazel_dep(name = "contrib_rules_jvm", version = "0.0.0")
 local_path_override(
     module_name = "contrib_rules_jvm",
     path = "../..",
 )
 
-bazel_dep(
-    name = "bazel_skylib",
-    version = "1.5.0",
-)
-bazel_dep(
-    name = "rules_jvm_external",
-    version = "6.2",
-)
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "gazelle", version = "0.42.0")
+bazel_dep(name = "rules_jvm_external", version = "6.6")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
@@ -33,18 +25,4 @@ maven.install(
     fetch_sources = True,
     lock_file = "//:maven_install.json",
 )
-use_repo(
-    maven,
-    "maven",
-    "unpinned_maven",
-)
-
-bazel_dep(
-    name = "gazelle",
-    version = "0.36.0",
-)
-git_override(
-    module_name = "gazelle",
-    commit = "ba2ce367a545e0bdd74a7abca40ef5e0a0cb8dcb",
-    remote = "https://github.com/bazelbuild/bazel-gazelle.git",
-)
+use_repo(maven, "maven")