Clean up build after update to 7.2.0

Closes bazelbuild#22400. PiperOrigin-RevId: 642564375 Change-Id: I1326aa33ddd30d29a51b928adcea0def42304fe9
bazel-io · Jun 12, 2024 · 09604c8 · 09604c8
1 parent 7a75d7a
commit 09604c8
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 202 deletions.
diff --git a/BUILD b/BUILD
@@ -196,9 +196,7 @@ pkg_tar(
 write_file(
     name = "gen_maven_repo_name",
     out = "MAVEN_CANONICAL_REPO_NAME",
-    # TODO: Use this instead after building with Bazel 7.1.0 or later.
-    #    content = [get_canonical_repo_name("@maven")],
-    content = ["rules_jvm_external~~maven~maven"],
+    content = [get_canonical_repo_name("@maven")],
 )
 
 # The @maven repository is created by maven_install from rules_jvm_external.

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -33,9 +33,6 @@ bazel_dep(name = "rules_testing", version = "0.6.0")
 bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest")
 bazel_dep(name = "with_cfg.bzl", version = "0.2.4")
 
-# TODO(fmeum): Remove the dependency on buildozer after Bazel is built with 7.2.0.
-bazel_dep(name = "buildozer", version = "7.1.2")
-
 # TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR.
 bazel_dep(name = "remoteapis", version = "")
 bazel_dep(name = "googleapis", version = "")

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/repositories.bzl b/repositories.bzl
@@ -29,7 +29,6 @@ DIST_ARCHIVE_REPOS = [get_canonical_repo_name(repo) for repo in [
     "apple_support",
     "bazel_skylib",
     "blake3",
-    "buildozer",
     "c-ares",
     "com_github_grpc_grpc",
     "com_google_protobuf",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpec.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpec.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.bazel.bzlmod;
 
 import com.google.auto.value.AutoValue;
-import com.google.common.collect.Maps;
 import com.ryanharter.auto.value.gson.GenerateTypeAdapter;
 import javax.annotation.Nullable;
 
@@ -52,28 +51,11 @@ public static Builder builder() {
   public abstract static class Builder {
     public abstract Builder setBzlFile(String bzlFile);
 
-    abstract String bzlFile();
-
     public abstract Builder setRuleClassName(String name);
 
     public abstract Builder setAttributes(AttributeValues attributes);
 
-    abstract AttributeValues attributes();
-
-    abstract RepoSpec autoBuild();
-
-    public final RepoSpec build() {
-      // Ensure backwards compatibility with old lockfiles that still specify the 'name' attribute.
-      // TODO: Remove this after both the lockfile version has been bumped and Bazel is built with
-      //  with Bazel 7.1.0.
-      AttributeValues attributes = attributes();
-      if (attributes.attributes().containsKey("name")) {
-        setAttributes(
-            AttributeValues.create(
-                Maps.filterKeys(attributes.attributes(), k -> !k.equals("name"))));
-      }
-      return autoBuild();
-    }
+    abstract RepoSpec build();
   }
 
   public boolean isNativeRepoRule() {

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoRuleFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoRuleFunction.java
@@ -67,11 +67,8 @@ public final class BzlmodRepoRuleFunction implements SkyFunction {
    * in unambiguous canonical form and thus require no mapping, except instances read from old
    * lockfiles.
    */
-  // TODO(fmeum): Make this mapping truly empty after bumping LOCK_FILE_VERSION.
   private static final RepositoryMapping EMPTY_MAIN_REPO_MAPPING =
-      RepositoryMapping.create(
-          ImmutableMap.of("", RepositoryName.MAIN, "bazel_tools", RepositoryName.BAZEL_TOOLS),
-          RepositoryName.MAIN);
+      RepositoryMapping.create(ImmutableMap.of(), RepositoryName.MAIN);
 
   public BzlmodRepoRuleFunction(RuleClassProvider ruleClassProvider, BlazeDirectories directories) {
     this.ruleClassProvider = ruleClassProvider;

diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
@@ -1,5 +1,6 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("//:workspace_deps.bzl", "gen_workspace_stanza")
+load("//src/tools/bzlmod:utils.bzl", "get_canonical_repo_name")
 
 package(default_visibility = ["//visibility:private"])
 
@@ -220,9 +221,7 @@ sh_test(
 write_file(
     name = "gen_rules_java_repo_name",
     out = "RULES_JAVA_REPO_NAME",
-    # TODO: Revert to the following when building with Bazel 7.1.0.
-    # content = [get_canonical_repo_name("@rules_java")],
-    content = ["rules_java~"],
+    content = [get_canonical_repo_name("@rules_java")],
 )
 
 sh_test(