Drop Scala 2.13 version guards from Bazel definitions (#11819)

changelog_begin changelog_end
digital-asset · Nov 22, 2021 · addb2ed · addb2ed
1 parent 5785bbf
commit addb2ed
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 20 deletions.
diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
@@ -195,7 +195,7 @@ genrule(
             "@sphinx_nix//:bin/sphinx-build",
             "@imagemagick_nix//:bin/convert",
         ] + (["@glibc_locales//:locale-archive"] if is_linux else []),
-) if scala_major_version == "2.13" and not is_windows else None
+) if not is_windows else None
 
 genrule(
     name = "docs-no-pdf",
@@ -317,7 +317,7 @@ genrule(
         "//bazel_tools/sh:mktgz",
         "//docs:generate-error-codes-json",
     ] + (["@glibc_locales//:locale-archive"] if is_linux else []),
-) if scala_major_version == "2.13" and not is_windows else None
+) if not is_windows else None
 
 genrule(
     name = "redirects",
@@ -384,7 +384,7 @@ genrule(
     stamp = 1,
     tags = ["pdfdocs"],
     tools = ["//bazel_tools/sh:mktgz"],
-) if scala_major_version == "2.13" and not is_windows else None
+) if not is_windows else None
 
 filegroup(
     name = "daml-assistant-iou-setup",
@@ -664,7 +664,7 @@ genrule(
     cmd = "$(location //ledger/error/generator:export-error-codes-json-app) $(location error_codes_export.json)",
     tools = ["//ledger/error/generator:export-error-codes-json-app"],
     visibility = ["//visibility:public"],
-) if scala_major_version == "2.13" else None
+)
 
 exports_files([
     "source/daml-script/template-root/src/ScriptExample.daml",

diff --git a/ledger-service/http-json-perf/BUILD.bazel b/ledger-service/http-json-perf/BUILD.bazel
@@ -88,7 +88,7 @@ perf_runtime_deps = {
         "ce",
         "ee",
     ]
-] if scala_major_version == "2.13" else None
+]
 
 daml_compile(
     name = "LargeAcs",
@@ -150,6 +150,6 @@ daml_compile(
         "ce",
         "ee",
     ]
-] if scala_major_version == "2.13" else None
+]
 
 exports_files(["release/json-api-perf-logback.xml"])
diff --git a/ledger-service/http-json/BUILD.bazel b/ledger-service/http-json/BUILD.bazel
@@ -407,10 +407,6 @@ alias(
             "src/it/scala/**/*.scala",
             "src/it/edition/{}/**/*.scala".format(edition),
         ]),
-        args = [
-            "-l",
-            "skip_scala_2_12",
-        ] if scala_major_version == "2.12" else [],
         data = [
             ":Account.dar",
             ":User.dar",

diff --git a/ledger-service/http-json/src/itlib/scala/http/AbstractHttpServiceIntegrationTest.scala b/ledger-service/http-json/src/itlib/scala/http/AbstractHttpServiceIntegrationTest.scala
@@ -53,9 +53,6 @@ import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Success, Try}
 import com.daml.ledger.api.{domain => LedgerApiDomain}
 import com.daml.ports.Port
-import org.scalatest.Tag
-
-object SkipScala212 extends Tag("skip_scala_2_12")
 
 object AbstractHttpServiceIntegrationTestFuns {
   private[http] val dar1 = requiredResource(ModelTestDar.path)
@@ -1787,7 +1784,7 @@ abstract class AbstractHttpServiceIntegrationTest
       } yield succeed
   }
 
-  "archiving a large number of contracts should succeed" taggedAs (SkipScala212) in withHttpServiceAndClient(
+  "archiving a large number of contracts should succeed" in withHttpServiceAndClient(
     StartSettings.DefaultMaxInboundMessageSize * 10
   ) { (uri, encoder, _, _, _) =>
     val (alice, headers) = getUniquePartyAndAuthHeaders("Alice")

diff --git a/ledger/daml-on-sql/BUILD.bazel b/ledger/daml-on-sql/BUILD.bazel
@@ -194,4 +194,4 @@ genrule(
         "@sphinx_nix//:bin/sphinx-build",
         "//bazel_tools/sh:mktgz",
     ] + (["@glibc_locales//:locale-archive"] if is_linux else []),
-) if scala_major_version == "2.13" and not is_windows else None
+) if not is_windows else None
diff --git a/ledger/error/generator/BUILD.bazel b/ledger/error/generator/BUILD.bazel
@@ -63,4 +63,4 @@ da_scala_test_suite(
         "@maven//:org_scalatest_scalatest_compatible",
         "@maven//:org_slf4j_slf4j_api",
     ],
-) if scala_major_version == "2.13" else None
+)
diff --git a/ledger/participant-state/kvutils/tools/BUILD.bazel b/ledger/participant-state/kvutils/tools/BUILD.bazel
@@ -68,7 +68,6 @@ da_scala_test(
         "@maven//:org_scalatest_scalatest_wordspec",
     ],
     deps = [
-        "@maven//:org_scalatest_scalatest_compatible",
         "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/transaction",
@@ -82,8 +81,10 @@ da_scala_test(
         "//ledger/participant-state/kvutils",
         "//ledger/participant-state/kvutils/tools",
         "//libs-scala/contextualized-logging",
+        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_mockito_mockito_core",
-    ] + (["@maven//:com_google_protobuf_protobuf_java"] if scala_major_version == "2.13" else []),
+        "@maven//:org_scalatest_scalatest_compatible",
+    ],
 )
 
 da_scala_binary(

diff --git a/libs-scala/gatling-utils/BUILD.bazel b/libs-scala/gatling-utils/BUILD.bazel
@@ -43,7 +43,7 @@ da_scala_library(
         "@maven//:io_netty_netty_transport",
         "@maven//:org_slf4j_slf4j_api",
     ],
-) if scala_major_version == "2.13" else None
+)
 
 filegroup(
     name = "test-simulation-logs",
@@ -73,4 +73,4 @@ da_scala_test(
         "//bazel_tools/runfiles:scala_runfiles",
         "@maven//:org_scalatest_scalatest_compatible",
     ],
-) if scala_major_version == "2.13" else None
+)