Upgrade rules_scala, tensorflow, bazel_features. Get build passing except for UI build failure

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

WORKSPACE

@@ -19,6 +19,9 @@ pl_register_cc_toolchains()
 # Install Pixie Labs Dependencies.
 pl_deps()
 
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
 
 # Order is important. Try to go from most basic/primitive to higher level packages.
 # - go_rules_dependencies
@@ -58,19 +61,19 @@ load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
 
 grpc_deps()
 
-load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
+load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
 
-scala_version = "2.13.12"
+rules_scala_dependencies()
 
-scala_config(scala_version = scala_version)
+load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
 
-load("@io_bazel_rules_scala//scala:scala.bzl", "rules_scala_setup", "rules_scala_toolchain_deps_repositories")
+scala_version = "2.13.16"
 
-rules_scala_setup()
+scala_config(scala_version = scala_version)
 
-rules_scala_toolchain_deps_repositories(fetch_sources = True)
+load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains", "scala_toolchains")
 
-load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
+scala_toolchains(fetch_sources = True, twitter_scrooge = True)
 
 scala_register_toolchains()
 

bazel/external/protobuf_py_proto_library.patch

@@ -0,0 +1,25 @@
+diff --git a/protobuf.bzl b/protobuf.bzl
+--- a/protobuf.bzl
++++ b/protobuf.bzl
+@@ -637,6 +637,21 @@ def internal_py_proto_library(
+         **kargs
+     )
+
++def py_proto_library(**kargs):
++    """Deprecated alias for use before Bazel 5.3.
++
++    This is provided for backwards compatibility only.  Users should migrate
++    to the py_proto_library rule from bazel/py_proto_library.bzl instead.
++
++    Args:
++      **kargs: arguments that are passed to internal_py_proto_library.
++
++    """
++
++    # buildifier: disable=native-py-proto
++    internal_py_proto_library(**kargs)
++
++
+ def _source_proto_library(
+         name,
+         srcs = [],

bazel/external/tensorflow_disable_py_v2.20.patch

@@ -0,0 +1,110 @@
+diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
+index f28f12927db..cc1b1ea29b9 100644
+--- a/tensorflow/tensorflow.bzl
++++ b/tensorflow/tensorflow.bzl
+@@ -3027,9 +3027,7 @@ _local_genrule_internal = rule(
+ # Wrap the rule in a macro so we can pass in exec_compatible_with.
+ def _local_genrule(**kwargs):
+     _local_genrule_internal(
+-        exec_compatible_with = [
+-            "@local_execution_config_platform//:platform_constraint",
+-        ],
++        exec_compatible_with = [],
+         **kwargs
+     )
+
+diff --git a/tensorflow/tensorflow.default.bzl b/tensorflow/tensorflow.default.bzl
+index fc6793e5d74..1585754a602 100644
+--- a/tensorflow/tensorflow.default.bzl
++++ b/tensorflow/tensorflow.default.bzl
+@@ -1,15 +1,5 @@
+ """Default (OSS) build versions of TensorFlow general-purpose build extensions."""
+
+-load(
+-    "@local_xla//third_party/py/rules_pywrap:pywrap.default.bzl",
+-    _pywrap_aware_cc_import = "pywrap_aware_cc_import",
+-    _pywrap_aware_filegroup = "pywrap_aware_filegroup",
+-    _pywrap_aware_genrule = "pywrap_aware_genrule",
+-    _pywrap_binaries = "pywrap_binaries",
+-    _pywrap_common_library = "pywrap_common_library",
+-    _pywrap_library = "pywrap_library",
+-    _stripped_cc_info = "stripped_cc_info",
+-)
+ load(
+     "//tensorflow:tensorflow.bzl",
+     _ADDITIONAL_API_INDEXABLE_SETTINGS = "ADDITIONAL_API_INDEXABLE_SETTINGS",
+@@ -107,10 +97,15 @@ tf_disable_ptxas_warning_flags = _tf_disable_ptxas_warning_flags
+ replace_with_portable_tf_lib_when_required = _replace_with_portable_tf_lib_when_required
+ tf_python_framework_friends = _tf_python_framework_friends
+ pywrap_aware_tf_cc_shared_object = _pywrap_aware_tf_cc_shared_object
+-pywrap_aware_filegroup = _pywrap_aware_filegroup
+-pywrap_aware_genrule = _pywrap_aware_genrule
+-pywrap_aware_cc_import = _pywrap_aware_cc_import
+-pywrap_library = _pywrap_library
+-pywrap_common_library = _pywrap_common_library
+-stripped_cc_info = _stripped_cc_info
+-pywrap_binaries = _pywrap_binaries
++
++# Stub out pywrap symbols that require @python_version_repo
++def _not_implemented(*args, **kwargs):
++    fail("pywrap rules are disabled")
++
++pywrap_aware_filegroup = _not_implemented
++pywrap_aware_genrule = _not_implemented
++pywrap_aware_cc_import = _not_implemented
++pywrap_library = _not_implemented
++pywrap_common_library = _not_implemented
++stripped_cc_info = _not_implemented
++pywrap_binaries = _not_implemented
+diff --git a/tensorflow/tf_version.default.bzl b/tensorflow/tf_version.default.bzl
+index 6b2374cc96c..95cbf574544 100644
+--- a/tensorflow/tf_version.default.bzl
++++ b/tensorflow/tf_version.default.bzl
+@@ -1,10 +1,5 @@
+ """Default (OSS) TensorFlow wheel version suffix data."""
+
+-load(
+-    "@tf_wheel_version_suffix//:wheel_version_suffix.bzl",
+-    "SEMANTIC_WHEEL_VERSION_SUFFIX",
+-    "WHEEL_VERSION_SUFFIX",
+-)
+-
+-VERSION_SUFFIX = WHEEL_VERSION_SUFFIX
+-SEMANTIC_VERSION_SUFFIX = SEMANTIC_WHEEL_VERSION_SUFFIX
++# Stub out wheel version suffix (not needed for TF Lite builds)
++VERSION_SUFFIX = ""
++SEMANTIC_VERSION_SUFFIX = ""
+diff --git a/tensorflow/workspace1.bzl b/tensorflow/workspace1.bzl
+index 399ff8f7579..af35b6d1972 100644
+--- a/tensorflow/workspace1.bzl
++++ b/tensorflow/workspace1.bzl
+@@ -15,8 +15,8 @@ def workspace(with_rules_cc = True):
+     Args:
+       with_rules_cc: Unused, to be removed soon.
+     """
+-    llvm_setup(name = "llvm-project")
+-    native.register_toolchains("@local_config_python//:py_toolchain")
++    # llvm_setup(name = "llvm-project")
++    # native.register_toolchains("@local_config_python//:py_toolchain")
+     rules_pkg_dependencies()
+
+     closure_repositories()
+diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
+index 9e49ab40b25..fc13a5172d7 100644
+--- a/tensorflow/workspace2.bzl
++++ b/tensorflow/workspace2.bzl
+@@ -105,11 +105,11 @@ def _initialize_third_party():
+
+ # Toolchains & platforms required by Tensorflow to build.
+ def _tf_toolchains():
+-    native.register_execution_platforms("@local_execution_config_platform//:platform")
+-    native.register_toolchains("@local_execution_config_python//:py_toolchain")
++    # native.register_execution_platforms("@local_execution_config_platform//:platform")
++    # native.register_toolchains("@local_execution_config_python//:py_toolchain")
+
+     # Loads all external repos to configure RBE builds.
+-    initialize_rbe_configs()
++    # initialize_rbe_configs()
+
+     # Note that we check the minimum bazel version in WORKSPACE.
+     clang6_configure(name = "local_config_clang6")

bazel/repositories.bzl

@@ -121,20 +121,29 @@ def _cc_deps():
     # Dependencies with native bazel build files.
 
     _bazel_repo("upb")
-    _bazel_repo("com_google_protobuf", patches = ["//bazel/external:protobuf_text_format_v31_part1.patch", "//bazel/external:protobuf_text_format_v31_part2.patch"], patch_args = ["-p1"])
+    _bazel_repo("com_google_protobuf", patches = ["//bazel/external:protobuf_text_format_v31_part1.patch", "//bazel/external:protobuf_text_format_v31_part2.patch", "//bazel/external:protobuf_py_proto_library.patch"], patch_args = ["-p1"])
     # _bazel_repo("com_google_protobuf", patches = ["//bazel/external:protobuf_text_format.patch", "//bazel/external:protobuf_warning.patch"], patch_args = ["-p1"])
     _bazel_repo("com_github_grpc_grpc", patches = ["//bazel/external:grpc_go_toolchain.patch"], patch_args = ["-p1"])
 
     _bazel_repo("boringssl", patches = ["//bazel/external:boringssl.patch"], patch_args = ["-p0"])
     _bazel_repo("com_google_benchmark")
     _bazel_repo("com_google_googletest")
+    _bazel_repo("googletest")  # Alias for deps that use this name
     _bazel_repo("com_github_gflags_gflags")
     _bazel_repo("com_github_google_glog")
     _bazel_repo("com_google_absl")
     _bazel_repo("abseil-cpp")  # Alias for gRPC/Protobuf
     _bazel_repo("com_google_flatbuffers")
     _bazel_repo("cpuinfo", patches = ["//bazel/external:cpuinfo.patch"], patch_args = ["-p1"])
-    _bazel_repo("org_tensorflow", patches = ["//bazel/external:tensorflow_disable_llvm.patch", "//bazel/external:tensorflow_disable_mirrors.patch", "//bazel/external:tensorflow_disable_py.patch"], patch_args = ["-p1"])
+    # _bazel_repo("org_tensorflow", patches = ["//bazel/external:tensorflow_disable_llvm.patch", "//bazel/external:tensorflow_disable_mirrors.patch", "//bazel/external:tensorflow_disable_py.patch"], patch_args = ["-p1"])
+    _bazel_repo("org_tensorflow", patches = ["//bazel/external:tensorflow_disable_py_v2.20.patch"], patch_args = ["-p1"])
+
+    # Stub CUDA repository for TensorFlow (we don't need CUDA support)
+    native.new_local_repository(
+        name = "local_config_cuda",
+        path = "bazel/external/local_config_cuda",
+        build_file_content = "",
+    )
     _bazel_repo("com_github_neargye_magic_enum")
     _bazel_repo("com_github_thoughtspot_threadstacks")
     _bazel_repo("com_googlesource_code_re2", patches = ["//bazel/external:re2_warning.patch"], patch_args = ["-p1"])
@@ -245,6 +254,7 @@ def _pl_deps():
     _bazel_repo("io_bazel_rules_go", patches = ["//bazel/external:rules_go.patch"], patch_args = ["-p1"])
     _bazel_repo("rules_java")
     _bazel_repo("io_bazel_rules_scala")
+    _bazel_repo("rules_scala")
     _bazel_repo("rules_jvm_external")
     _bazel_repo("rules_foreign_cc")
     _bazel_repo("io_bazel_rules_k8s")
@@ -255,6 +265,8 @@ def _pl_deps():
     _bazel_repo("com_github_bazelbuild_buildtools")
     _bazel_repo("com_github_fmeum_rules_meta")
     _bazel_repo("com_google_protobuf_javascript", patches = ["//bazel/external:protobuf_javascript.patch"], patch_args = ["-p1"])
+    _bazel_repo("bazel_features")
+    _bazel_repo("with_cfg.bzl")
 
     _com_llvm_lib()
     _cc_deps()

bazel/repository_locations.bzl

@@ -237,7 +237,7 @@ REPOSITORY_LOCATIONS = dict(
         urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20250512.1.tar.gz"],
     ),
     com_google_benchmark = dict(
-        sha256 = "3aff99169fa8bdee356eaa1f691e835a6e57b1efeadb8a0f9f228531158245ac",
+        sha256 = "d26789a2b46d8808a48a4556ee58ccc7c497fcd4c0af9b90197674a81e04798a",
         strip_prefix = "benchmark-1.8.5",
         urls = ["https://github.com/google/benchmark/archive/refs/tags/v1.8.5.tar.gz"],
     ),
@@ -439,16 +439,23 @@ REPOSITORY_LOCATIONS = dict(
         ],
     ),
     io_bazel_rules_scala = dict(
-        sha256 = "3b00fa0b243b04565abb17d3839a5f4fa6cc2cac571f6db9f83c1982ba1e19e5",
+        sha256 = "a4700d6e6cdf13cf85e29029ec998e2ec3ba94791606ec83d2c96e3c5b0aebed",
         urls = [
-            "https://github.com/bazelbuild/rules_scala/releases/download/v6.5.0/rules_scala-v6.5.0.tar.gz",
+            "https://github.com/bazelbuild/rules_scala/releases/download/v7.0.0/rules_scala-v7.0.0.tar.gz",
         ],
-        strip_prefix = "rules_scala-6.5.0",
+        strip_prefix = "rules_scala-7.0.0",
+    ),
+    rules_scala = dict(
+        sha256 = "a4700d6e6cdf13cf85e29029ec998e2ec3ba94791606ec83d2c96e3c5b0aebed",
+        urls = [
+            "https://github.com/bazelbuild/rules_scala/releases/download/v7.0.0/rules_scala-v7.0.0.tar.gz",
+        ],
+        strip_prefix = "rules_scala-7.0.0",
     ),
     org_tensorflow = dict(
-        sha256 = "99c732b92b1b37fc243a559e02f9aef5671771e272758aa4aec7f34dc92dac48",
-        strip_prefix = "tensorflow-2.11.0",
-        urls = ["https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.0.tar.gz"],
+        sha256 = "a640d1f97be316a09301dfc9347e3d929ad4d9a2336e3ca23c32c93b0ff7e5d0",
+        strip_prefix = "tensorflow-2.20.0",
+        urls = ["https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.20.0.tar.gz"],
     ),
     org_libc_musl = dict(
         sha256 = "7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4",
@@ -462,9 +469,9 @@ REPOSITORY_LOCATIONS = dict(
         urls = ["https://github.com/bazelbuild/rules_foreign_cc/archive/refs/tags/0.8.0.tar.gz"],
     ),
     rules_java = dict(
-	sha256 = "c5bc17e17bb62290b1fd8fdd847a2396d3459f337a7e07da7769b869b488ec26",
+	sha256 = "a64ab04616e76a448c2c2d8165d836f0d2fb0906200d0b7c7376f46dd62e59cc",
 	urls = [
-	    "https://github.com/bazelbuild/rules_java/releases/download/8.6.1/rules_java-8.6.1.tar.gz",
+	    "https://github.com/bazelbuild/rules_java/releases/download/8.6.2/rules_java-8.6.2.tar.gz",
 	],
 	# strip_prefix = "rules_java-8.6.1",
     ),
@@ -515,6 +522,24 @@ REPOSITORY_LOCATIONS["abseil-cpp"] = dict(
     urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20250512.1.tar.gz"],
 )
 
+REPOSITORY_LOCATIONS["with_cfg.bzl"] = dict(
+    sha256 = "c7af6227d24499438fa0bb96fe4034e163d8c807b06f7c0645f3654448268b84",
+    strip_prefix = "with_cfg.bzl-0.11.0",
+    urls = ["https://github.com/fmeum/with_cfg.bzl/releases/download/v0.11.0/with_cfg.bzl-v0.11.0.tar.gz"],
+)
+
+REPOSITORY_LOCATIONS["bazel_features"] = dict(
+    sha256 = "07271d0f6b12633777b69020c4cb1eb67b1939c0cf84bb3944dc85cc250c0c01",
+    strip_prefix = "bazel_features-1.38.0",
+    urls = ["https://github.com/bazel-contrib/bazel_features/releases/download/v1.38.0/bazel_features-v1.38.0.tar.gz"],
+)
+
+REPOSITORY_LOCATIONS["googletest"] = dict(
+    sha256 = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c",
+    strip_prefix = "googletest-1.17.0",
+    urls = ["https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz"],
+)
+
 # To modify one of the forked repos below:
 #  1. Make the changes to the repo and push the changes to the `pixie` on github.
 #  2. Update the commit below to point to the commit hash of the new `pixie` branch.

bazel/thrift.bzl

@@ -14,11 +14,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-load("@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 def thrift_deps(scala_version):
-    twitter_scrooge()
+    # twitter_scrooge is now set up via scala_toolchains(twitter_scrooge = True) in WORKSPACE
 
     finagle_version = "22.7.0"
     scala_minor_version = ".".join(scala_version.split(".")[:2])

bazel/toolchain_transitions.bzl

@@ -14,30 +14,14 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-load("@com_github_fmeum_rules_meta//meta:defs.bzl", "meta")
+load("@with_cfg.bzl", "with_cfg")
 load("//bazel/test_runners/qemu_with_kernel:runner.bzl", "qemu_with_kernel_interactive_runner")
 
-java_graal_binary = meta.wrap_with_transition(
-    native.java_binary,
-    {
-        "java_runtime_version": meta.replace_with("remotejdk_openjdk_graal_17"),
-    },
-    executable = True,
-)
+java_graal_binary, _java_graal_binary_internal = with_cfg(native.java_binary).set(
+    "java_runtime_version", "remotejdk_openjdk_graal_17").build()
 
-cc_clang_binary = meta.wrap_with_transition(
-    native.cc_binary,
-    {
-        "@//bazel/cc_toolchains:compiler": meta.replace_with("clang"),
-        "@//bazel/cc_toolchains:libc_version": meta.replace_with("glibc2_36"),
-    },
-    executable = True,
-)
+cc_clang_binary, _cc_clang_binary_internal = with_cfg(native.cc_binary).set(
+        Label("@//bazel/cc_toolchains:compiler"), "clang").build()
 
-qemu_interactive_runner = meta.wrap_with_transition(
-    qemu_with_kernel_interactive_runner,
-    {
-        "@//bazel/cc_toolchains:libc_version": meta.replace_with("glibc2_36"),
-    },
-    executable = True,
-)
+qemu_interactive_runner, _qemu_interactive_runner_internal = with_cfg(qemu_with_kernel_interactive_runner).set(
+    Label("@//bazel/cc_toolchains:libc_version"), "glibc2_36").build()