Update Bazel to 7.1.1 and rules_jvm_external to 5.3

.bazelrc

@@ -6,9 +6,12 @@ build --verbose_failures
 # Action Env
 build --incompatible_strict_action_env
 build --repo_env=RJE_VERBOSE=true
+common --noincompatible_disallow_unsound_directory_outputs
 
 common --experimental_google_legacy_api
 
+common --enable_bzlmod=false
+
 # Workers
 build --experimental_worker_multiplex
 

.bazelversion

@@ -1 +1 @@
-6.3.2
+7.1.1

WORKSPACE

@@ -1,6 +1,5 @@
 workspace(name = "grab_bazel_common")
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@grab_bazel_common//rules:repositories.bzl", "bazel_common_dependencies")
 
 bazel_common_dependencies()

rules/repositories.bzl

@@ -5,14 +5,14 @@ def http_archive(name, **kwargs):
     maybe(_http_archive, name = name, **kwargs)
 
 def _maven():
-    RULES_JVM_EXTERNAL_TAG = "4.4.2"
-    RULES_JVM_EXTERNAL_SHA = "735602f50813eb2ea93ca3f5e43b1959bd80b213b836a07a62a29d757670b77b"
+    RULES_JVM_EXTERNAL_TAG = "5.3"
+    RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac"
 
     http_archive(
         name = "rules_jvm_external",
         sha256 = RULES_JVM_EXTERNAL_SHA,
         strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
-        url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
+        url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG),
     )
 
     DAGGER_TAG = "2.46.1"

rules/setup.bzl

@@ -87,11 +87,11 @@ def bazel_common_setup(
             "org.json:json:20210307",
         ],
         repositories = DAGGER_REPOSITORIES + [
-            "https://jcenter.bintray.com/",
             "https://maven.google.com",
             "https://repo1.maven.org/maven2",
         ],
         strict_visibility = True,
+        resolve_timeout = 3500,
         maven_install_json = maven_install_json,
         fetch_sources = True,
     )

tools/maven/src/main/kotlin/com/grab/maven/MavenInstallPin.kt

@@ -11,17 +11,16 @@ import java.io.File
 class MavenInstallPin : CliktCommand() {
 
     private val mavenRepoName by option(
-        "-M",
+        "-m",
         "--maven_repo",
         help = "Name of the maven_install repo to run pinning"
     ).required()
 
-    private val workingDir = System.getenv("BUILD_WORKSPACE_DIRECTORY")
-        ?: error("Missing BUILD_WORKSPACE_DIRECTORY environment")
+    private val workingDir = System.getenv("BUILD_WORKSPACE_DIRECTORY") ?: error("Missing BUILD_WORKSPACE_DIRECTORY environment")
 
     private val bazelInvoker = BazelInvokerFactory.create(workingDir = workingDir)
 
-
+    @Suppress("SameParameterValue")
     private fun file(name: String) = File(workingDir, name)
 
     override fun run() {

tools/maven/src/main/kotlin/com/grab/maven/WorkspaceUpdater.kt

@@ -5,9 +5,8 @@ import java.io.File
 class WorkspaceUpdater(
     private val workspace: File
 ) {
-
     private val pinnedMavenInstallAttr = "pinned_maven_install ="
-    private val pinBazelCommonArtifacts = "pin_bazel_common_artifacts()"
+    private val pinBazelCommonArtifacts = "pin_bazel_common_dependencies()"
 
     fun pin() {
         with(workspace) {
@@ -16,7 +15,7 @@ class WorkspaceUpdater(
                     "$pinnedMavenInstallAttr False",
                     "$pinnedMavenInstallAttr True"
                 ).replace(
-                    "#+pin_bazel_common_artifacts\\(\\)".toRegex(),
+                    "#+pin_bazel_common_dependencies\\(\\)".toRegex(),
                     pinBazelCommonArtifacts
                 )
             )