Update rules_scala (#11616)

* Update rules_scala Two patches have since been upstreamed and can be removed. changelog_begin changelog_end * JMH deps were moved into a toolchain bazelbuild/rules_scala#1106 changelog_begin changelog_end Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
digital-asset · Nov 11, 2021 · a9de728 · a9de728
1 parent f468969
commit a9de728
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 60 deletions.
diff --git a/bazel_tools/rules_scala_java_bin_path.patch b/bazel_tools/rules_scala_java_bin_path.patch
diff --git a/bazel_tools/rules_scala_suite_tags.patch b/bazel_tools/rules_scala_suite_tags.patch
diff --git a/compatibility/deps.bzl b/compatibility/deps.bzl
@@ -128,8 +128,6 @@ def daml_deps():
             sha256 = rules_scala_sha256,
             patches = [
                 "@daml//bazel_tools:scala-escape-jvmflags.patch",
-                # Remove once https://github.com/bazelbuild/rules_scala/pull/1313 is merged
-                "@daml//bazel_tools:rules_scala_java_bin_path.patch",
             ],
             patch_args = ["-p1"],
         )

diff --git a/deps.bzl b/deps.bzl
@@ -30,8 +30,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-rules_scala_version = "67a7ac178a73d1d5ff4c2b0663a8eda6dfcbbc56"
-rules_scala_sha256 = "95054009fd938ac7ef53a20619f94a5408d8ae74eb5b318cd150a3ecb1a6086f"
+rules_scala_version = "e4560ac332e9da731c1e50a76af2579c55836a5c"
+rules_scala_sha256 = "ccf19e8f966022eaaca64da559c6140b23409829cb315f2eff5dc3e757fb6ad8"
 
 rules_haskell_version = "673e74aea244a6a9ee1eccec719677c80348aebf"
 rules_haskell_sha256 = "73a06dc6e0d928ceeab64e2cd3159f863eb2e263ecc64d79e3952c770cd1ee51"
@@ -148,10 +148,6 @@ def daml_deps():
             sha256 = rules_scala_sha256,
             patches = [
                 "@com_github_digital_asset_daml//bazel_tools:scala-escape-jvmflags.patch",
-                # Remove once https://github.com/bazelbuild/rules_scala/pull/1261 is merged
-                "@com_github_digital_asset_daml//bazel_tools:rules_scala_suite_tags.patch",
-                # Remove once https://github.com/bazelbuild/rules_scala/pull/1313 is merged
-                "@com_github_digital_asset_daml//bazel_tools:rules_scala_java_bin_path.patch",
             ],
             patch_args = ["-p1"],
         )

diff --git a/ledger/sandbox-perf/BUILD.bazel b/ledger/sandbox-perf/BUILD.bazel
@@ -24,7 +24,6 @@ da_scala_library(
         "//bazel_tools/runfiles:scala_runfiles",
         "//daml-lf/archive:daml_lf_archive_reader",
         "//daml-lf/data",
-        "//external:io_bazel_rules_scala/dependency/jmh/jmh_core",
         "//language-support/scala/bindings",
         "//ledger-api/rs-grpc-akka",
         "//ledger-api/rs-grpc-bridge",
@@ -48,6 +47,7 @@ da_scala_library(
         "//libs-scala/resources",
         "//libs-scala/resources-akka",
         "//libs-scala/resources-grpc",
+        "@io_bazel_rules_scala//jmh:jmh_core",
         "@maven//:ch_qos_logback_logback_classic",
     ],
 )