chore: move to bazel 3.6-7.0 for toolchain transition (#4720)

* chore: move to bazel 3.6-7.0 for toolchain transition

* chore: fix BazelTestEngine join

.bazelminversion

@@ -1 +1 @@
-2.2.0
+3.6.0

.bazelversion

@@ -1 +1 @@
-3.6.0
+3.7.0

kythe/cxx/extractor/toolchain.bzl

@@ -19,7 +19,11 @@ load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 
 CxxExtractorToolchainInfo = provider(
     doc = "Provides required information for C++/ObjectiveC extractors.",
-    fields = ["cc_toolchain", "extractor_binary", "compiler_executable"],
+    fields = [
+        "cc_toolchain",
+        "extractor_binary",
+        "compiler_executable",
+    ],
 )
 
 CXX_EXTRACTOR_TOOLCHAINS = ["@io_kythe//kythe/cxx/extractor:toolchain_type"]
@@ -31,9 +35,9 @@ def _cxx_extractor_toolchain_impl(ctx):
     else:
         compiler_executable = cc_toolchain.compiler_executable
     cxx_extractor = CxxExtractorToolchainInfo(
-        extractor_binary = ctx.attr.extractor.files_to_run,
-        compiler_executable = compiler_executable,
         cc_toolchain = cc_toolchain,
+        compiler_executable = compiler_executable,
+        extractor_binary = ctx.attr.extractor.files_to_run,
     )
     return [
         platform_common.ToolchainInfo(
@@ -43,7 +47,6 @@ def _cxx_extractor_toolchain_impl(ctx):
     ]
 
 cxx_extractor_toolchain = rule(
-    implementation = _cxx_extractor_toolchain_impl,
     attrs = {
         "extractor": attr.label(
             executable = True,
@@ -55,9 +58,14 @@ cxx_extractor_toolchain = rule(
             default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
         ),
     },
-    provides = [CxxExtractorToolchainInfo, platform_common.ToolchainInfo],
     fragments = ["cpp"],
+    incompatible_use_toolchain_transition = True,
+    provides = [
+        CxxExtractorToolchainInfo,
+        platform_common.ToolchainInfo,
+    ],
     toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
+    implementation = _cxx_extractor_toolchain_impl,
 )
 
 def register_toolchains():

kythe/cxx/tools/fyi/testdata/compile_commands.bzl

@@ -34,9 +34,10 @@ compile_commands = rule(
         ),
     },
     doc = "Generates a compile_commannds.json.in template file.",
+    incompatible_use_toolchain_transition = True,
     outputs = {
         "compile_commands": "compile_commands.json.in",
     },
-    implementation = _compile_commands_impl,
     toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
+    implementation = _compile_commands_impl,
 )

tools/arc/unit/engine/BazelTestEngine.php

@@ -66,7 +66,7 @@ private function getTargets() {
     }
     // Quote each file to make it safe in case it has special characters in it.
     $files = array_map(function($s) { return '"'.$s.'"'; }, $files);
-    $files = join($files, " ");
+    $files = join(" ", $files);
     $this->debugPrint("files: " . $files);
 
     $cmd = $this->bazelCommand("query", ["-k", "%s"]);
@@ -111,7 +111,7 @@ private function getFileTargets() {
   }
 
   private function runTests($targets) {
-    $this->debugPrint("runTests(" . join($targets, ", ") . ")");
+    $this->debugPrint("runTests(" . join(", ", $targets) . ")");
 
     $tag_filters = join(",", array_map(function($s) { return "-$s"; }, self::$omit_tags));
     $future = new ExecFuture($this->bazelCommand("test", array_merge([

tools/build_rules/verifier_test/cc_indexer_test.bzl

@@ -256,6 +256,7 @@ _cc_kythe_proto_library_aspect = aspect(
         ),
     },
     fragments = ["cpp"],
+    incompatible_use_toolchain_transition = True,
     toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
     implementation = _cc_kythe_proto_library_aspect_impl,
 )

tools/platforms/configs/.latest.bazelrc

@@ -19,13 +19,13 @@
 # Specifically, it includes all toolchain/platform flags
 # This file is used for testing purposes.
 
-build:remote --host_javabase=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.6.0/java:jdk
-build:remote --javabase=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.6.0/java:jdk
-build:remote --crosstool_top=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.6.0/cc:toolchain
-build:remote --extra_toolchains=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.6.0/config:cc-toolchain
-build:remote --extra_execution_platforms=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.6.0/config:platform
-build:remote --host_platform=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.6.0/config:platform
-build:remote --platforms=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.6.0/config:platform
+build:remote --host_javabase=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.7.0/java:jdk
+build:remote --javabase=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.7.0/java:jdk
+build:remote --crosstool_top=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.7.0/cc:toolchain
+build:remote --extra_toolchains=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.7.0/config:cc-toolchain
+build:remote --extra_execution_platforms=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.7.0/config:platform
+build:remote --host_platform=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.7.0/config:platform
+build:remote --platforms=//tools/platforms/configs/default_toolchain_config_spec_name/bazel_3.7.0/config:platform
 
 # Import the default bazelrc file in bazel-toolchains repo.
 # This will only work for tests executed from bazel-toolchains