Drop 2.12 versioned_scala_deps (#11748)

I’ve kept the infrastructure for versioned_scala_deps around because I’m optimistic and hope that eventually we’ll do another Scala upgrade. changelog_begin changelog_end
digital-asset · Nov 17, 2021 · fa76631 · fa76631
1 parent c77e150
commit fa76631
Show file tree

Hide file tree

Showing 36 changed files with 156 additions and 293 deletions.
diff --git a/bazel-java-deps.bzl b/bazel-java-deps.bzl
@@ -19,20 +19,6 @@ load(
 )
 
 version_specific = {
-    "2.12": [
-    ],
-    "2.13": [
-        "org.scala-lang.modules:scala-parallel-collections_2.13:1.0.0",
-        # Gatling does not cross-build so this is limited to Scala 2.13.
-        "io.gatling:gatling-app:3.5.1",
-        "io.gatling:gatling-core:3.5.1",
-        "io.gatling:gatling-commons:3.5.1",
-        "io.gatling:gatling-recorder:3.5.1",
-        "io.gatling:gatling-charts:3.5.1",
-        "io.gatling.highcharts:gatling-charts-highcharts:3.5.1",
-        "io.gatling:gatling-http:3.5.1",
-        "io.gatling:gatling-http-client:3.5.1",
-    ],
 }
 
 netty_version = "4.1.67.Final"
@@ -44,8 +30,9 @@ netty_version = "4.1.67.Final"
 # <tcnative.version>2.0.42.Final</tcnative.version>
 # ```
 netty_tcnative_version = "2.0.40.Final"
-grpc_version = "1.41.0"
+grpc_version = "1.35.0"
 akka_version = "2.6.13"
+gatling_version = "3.5.1"
 
 def install_java_deps():
     maven_install(
@@ -148,6 +135,14 @@ def install_java_deps():
             "com.thesamet.scalapb:scalapb-runtime_{}:{}".format(scala_major_version, scalapb_version),
             "com.thesamet.scalapb:scalapb-runtime-grpc_{}:{}".format(scala_major_version, scalapb_version),
             # ---- end of grpc-protobuf-netty block
+            "io.gatling:gatling-app:{}".format(gatling_version),
+            "io.gatling:gatling-core:{}".format(gatling_version),
+            "io.gatling:gatling-commons:{}".format(gatling_version),
+            "io.gatling:gatling-recorder:{}".format(gatling_version),
+            "io.gatling:gatling-charts:{}".format(gatling_version),
+            "io.gatling.highcharts:gatling-charts-highcharts:{}".format(gatling_version),
+            "io.gatling:gatling-http:{}".format(gatling_version),
+            "io.gatling:gatling-http-client:{}".format(gatling_version),
             "io.reactivex.rxjava2:rxjava:2.2.1",
             "io.spray:spray-json_{}:1.3.5".format(scala_major_version),
             "javax.annotation:javax.annotation-api:1.2",
@@ -181,6 +176,7 @@ def install_java_deps():
             "org.scalacheck:scalacheck_{}:1.15.4".format(scala_major_version),
             "org.scala-lang.modules:scala-collection-compat_{}:2.3.2".format(scala_major_version),
             "org.scala-lang.modules:scala-java8-compat_{}:0.9.0".format(scala_major_version),
+            "org.scala-lang.modules:scala-parallel-collections_{}:1.0.0".format(scala_major_version),
             "org.scalameta:munit_{}:0.7.26".format(scala_major_version),
             "org.scalactic:scalactic_{}:3.2.9".format(scala_major_version),
             "org.scalatest:scalatest_{}:3.2.9".format(scala_major_version),

diff --git a/compiler/repl-service/server/BUILD.bazel b/compiler/repl-service/server/BUILD.bazel
@@ -29,9 +29,6 @@ da_scala_binary(
         "@maven//:org_scalaz_scalaz_core",
     ],
     scalacopts = repl_scalacopts,
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     runtime_deps = [
         "@maven//:ch_qos_logback_logback_classic",
     ],

diff --git a/daml-lf/archive/BUILD.bazel b/daml-lf/archive/BUILD.bazel
@@ -151,9 +151,6 @@ da_scala_test_suite(
         "@maven//:org_scalaz_scalaz_scalacheck_binding",
     ],
     scalacopts = lf_scalacopts,
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     deps = [
         ":daml_lf_1.11_archive_proto_java",
         ":daml_lf_1.12_archive_proto_java",

diff --git a/daml-lf/encoder/BUILD.bazel b/daml-lf/encoder/BUILD.bazel
@@ -48,11 +48,6 @@ da_scala_test_suite(
         "@maven//:org_scalaz_scalaz_core",
     ],
     scalacopts = lf_scalacopts,
-    versioned_scala_deps = {
-        "2.12": [
-            "@maven//:org_scala_lang_modules_scala_collection_compat",
-        ],
-    },
     deps = [
         ":encoder",
         "//bazel_tools/runfiles:scala_runfiles",

diff --git a/daml-lf/engine/BUILD.bazel b/daml-lf/engine/BUILD.bazel
@@ -19,9 +19,6 @@ da_scala_library(
     ],
     scalacopts = lf_scalacopts_stricter,
     tags = ["maven_coordinates=com.daml:daml-lf-engine:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = ["//visibility:public"],
     deps = [
         "//daml-lf/data",

diff --git a/daml-lf/interpreter/perf/BUILD.bazel b/daml-lf/interpreter/perf/BUILD.bazel
@@ -36,7 +36,9 @@ da_scala_binary(
         ":JsonParser.dar.pp",
     ],
     main_class = "com.daml.lf.speedy.explore.ExploreDar",
-    versioned_scala_deps = {"2.13": ["@maven//:org_scalaz_scalaz_core"]},
+    scala_deps = [
+        "@maven//:org_scalaz_scalaz_core",
+    ],
     runtime_deps = [
         "@maven//:ch_qos_logback_logback_classic",
     ],
@@ -60,7 +62,9 @@ da_scala_binary(
         ":Examples.dar.pp",
     ],
     main_class = "com.daml.lf.speedy.explore.SpeedTestNfib",
-    versioned_scala_deps = {"2.13": ["@maven//:org_scalaz_scalaz_core"]},
+    scala_deps = [
+        "@maven//:org_scalaz_scalaz_core",
+    ],
     runtime_deps = [
         "@maven//:ch_qos_logback_logback_classic",
     ],
@@ -89,7 +93,9 @@ da_scala_binary(
         ":JsonParser.dar.pp",
     ],
     main_class = "com.daml.lf.speedy.explore.SpeedTestJsonParser",
-    versioned_scala_deps = {"2.13": ["@maven//:org_scalaz_scalaz_core"]},
+    scala_deps = [
+        "@maven//:org_scalaz_scalaz_core",
+    ],
     runtime_deps = [
         "@maven//:ch_qos_logback_logback_classic",
     ],

diff --git a/daml-lf/language/BUILD.bazel b/daml-lf/language/BUILD.bazel
@@ -35,9 +35,6 @@ da_scala_test(
     scalacopts = lf_scalacopts + [
         "-P:silencer:lineContentFilters=signum",
     ],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scalaz_scalaz_core"],
-    },
     deps = [
         ":language",
         "//daml-lf/data",

diff --git a/daml-lf/repl/BUILD.bazel b/daml-lf/repl/BUILD.bazel
@@ -16,11 +16,6 @@ da_scala_binary(
         "@maven//:org_scalaz_scalaz_core",
     ],
     tags = ["maven_coordinates=com.daml:daml-lf-repl:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": [
-            "@maven//:org_scala_lang_modules_scala_collection_compat",
-        ],
-    },
     visibility = ["//visibility:public"],
     deps = [
         "//daml-lf/archive:daml_lf_archive_reader",

diff --git a/daml-lf/scenario-interpreter/BUILD.bazel b/daml-lf/scenario-interpreter/BUILD.bazel
@@ -23,7 +23,6 @@ da_scala_library(
     scala_deps = ["@maven//:org_typelevel_paiges_core"],
     scalacopts = lf_scalacopts_stricter,
     tags = ["maven_coordinates=com.daml:daml-lf-scenario-interpreter:__VERSION__"],
-    versioned_scala_deps = {"2.12": ["@maven//:org_scalaz_scalaz_core"]},
     visibility = [
         "//visibility:public",
     ],

diff --git a/daml-lf/transaction/BUILD.bazel b/daml-lf/transaction/BUILD.bazel
@@ -111,11 +111,6 @@ da_scala_test(
         silencer_plugin,
     ],
     scalacopts = lf_scalacopts,
-    versioned_scala_deps = {
-        "2.12": [
-            "@maven//:org_scalaz_scalaz_core",
-        ],
-    },
     deps = [
         ":transaction",
         "//daml-lf/data",

diff --git a/daml-lf/validation/BUILD.bazel b/daml-lf/validation/BUILD.bazel
@@ -42,11 +42,6 @@ da_scala_test(
     scalacopts = lf_scalacopts + [
         "-P:silencer:lineContentFilters=standardInterpolator",
     ],
-    versioned_scala_deps = {
-        "2.12": [
-            "@maven//:org_scalaz_scalaz_core",
-        ],
-    },
     deps = [
         ":validation",
         "//daml-lf/data",

diff --git a/daml-script/converter/BUILD.bazel b/daml-script/converter/BUILD.bazel
@@ -18,9 +18,6 @@ da_scala_library(
     ],
     scalacopts = script_scalacopts,
     tags = ["maven_coordinates=com.daml:script-converter:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = ["//visibility:public"],
     deps = [
         "//daml-lf/data",

diff --git a/daml-script/export/BUILD.bazel b/daml-script/export/BUILD.bazel
@@ -37,12 +37,6 @@ da_scala_binary(
         "@maven//:io_circe_circe_core",
         "@maven//:io_circe_circe_yaml",
     ],
-    versioned_scala_deps = {
-        "2.12": [
-            "@maven//:org_typelevel_cats_core",
-            "@maven//:org_typelevel_cats_kernel",
-        ],
-    },
     visibility = ["//visibility:public"],
     deps = [
         "//daml-lf/archive:daml_lf_archive_reader",

diff --git a/language-support/java/bindings-rxjava/BUILD.bazel b/language-support/java/bindings-rxjava/BUILD.bazel
@@ -67,9 +67,6 @@ da_scala_library(
         "@maven//:org_scalatest_scalatest_matchers_core",
         "@maven//:org_scalatest_scalatest_shouldmatchers",
     ],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     deps = [
         ":bindings-rxjava",
         "//daml-lf/data",
@@ -115,9 +112,6 @@ da_scala_test_suite(
         "@maven//:org_scalatest_scalatest_wordspec",
         "@maven//:org_scalatestplus_scalacheck_1_15",
     ],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     deps = [
         ":bindings-integration-tests-model-latest.jar",
         ":bindings-java-tests-lib",
@@ -156,9 +150,6 @@ da_scala_test(
         "@maven//:org_scalatest_scalatest_matchers_core",
         "@maven//:org_scalatest_scalatest_shouldmatchers",
     ],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     deps = [
         ":bindings-java-tests-lib",
         ":bindings-rxjava",

diff --git a/language-support/java/bindings/BUILD.bazel b/language-support/java/bindings/BUILD.bazel
@@ -90,9 +90,6 @@ da_scala_library(
     scala_deps = [
         "@maven//:org_scalacheck_scalacheck",
     ],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = [
         "//ledger-service/http-json:__subpackages__",
     ],

diff --git a/language-support/java/codegen/BUILD.bazel b/language-support/java/codegen/BUILD.bazel
@@ -90,11 +90,6 @@ da_scala_test(
         "@maven//:org_scalatest_scalatest_shouldmatchers",
         "@maven//:org_scalaz_scalaz_core",
     ],
-    versioned_scala_deps = {
-        "2.12": [
-            "@maven//:org_scala_lang_modules_scala_collection_compat",
-        ],
-    },
     deps = [
         ":lib",
         "//bazel_tools/runfiles:scala_runfiles",
@@ -345,9 +340,6 @@ da_scala_test(
         "@maven//:org_scalaz_scalaz_core",
     ],
     tags = ["exclusive"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     deps = [
         ":ledger-tests-model.jar",
         "//bazel_tools/runfiles:scala_runfiles",

diff --git a/ledger-service/jwt/BUILD.bazel b/ledger-service/jwt/BUILD.bazel
@@ -19,11 +19,6 @@ da_scala_library(
     ],
     scalacopts = lf_scalacopts,
     tags = ["maven_coordinates=com.daml:jwt:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": [
-            "@maven//:org_scala_lang_modules_scala_collection_compat",
-        ],
-    },
     visibility = ["//visibility:public"],
     runtime_deps = [
         "@maven//:ch_qos_logback_logback_classic",

diff --git a/ledger/error/BUILD.bazel b/ledger/error/BUILD.bazel
@@ -15,9 +15,6 @@ da_scala_library(
         "@maven//:io_spray_spray_json",
     ],
     tags = ["maven_coordinates=com.daml:error:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = ["//visibility:public"],
     deps = [
         "//daml-lf/archive:daml_lf_archive_reader",
@@ -65,9 +62,6 @@ da_scala_test_suite(
         "@maven//:org_scalatest_scalatest_matchers_core",
         "@maven//:org_scalatest_scalatest_shouldmatchers",
     ],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     deps = [
         ":error",
         ":error-test-utils",

diff --git a/ledger/error/generator/BUILD.bazel b/ledger/error/generator/BUILD.bazel
@@ -33,9 +33,6 @@ da_scala_library(
     name = "lib",
     srcs = glob(["lib/src/main/scala/**/*.scala"]),
     tags = ["maven_coordinates=com.daml:error-generator-lib:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = ["//visibility:public"],
     deps = [
         "//ledger/error",

diff --git a/ledger/ledger-api-common/BUILD.bazel b/ledger/ledger-api-common/BUILD.bazel
@@ -109,13 +109,11 @@ da_scala_test_suite(
         "@maven//:org_scalatest_scalatest_wordspec",
         "@maven//:org_scalaz_scalaz_core",
         "@maven//:org_scala_lang_modules_scala_collection_compat",
+        "@maven//:org_scala_lang_modules_scala_parallel_collections",
     ],
     scalacopts = [
         "-P:silencer:lineContentFilters=import scala.collection.parallel.CollectionConverters._",
     ],
-    versioned_scala_deps = {
-        "2.13": ["@maven//:org_scala_lang_modules_scala_parallel_collections"],
-    },
     deps = [
         ":ledger-api-common",
         ":ledger-api-common-scala-tests-lib",

diff --git a/ledger/metrics/BUILD.bazel b/ledger/metrics/BUILD.bazel
@@ -18,9 +18,6 @@ da_scala_library(
         "@maven//:com_github_scopt_scopt",
     ],
     tags = ["maven_coordinates=com.daml:metrics:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = [
         "//visibility:public",
     ],
@@ -53,9 +50,6 @@ da_scala_library(
         "@maven//:org_scalatest_scalatest_core",
     ],
     tags = ["maven_coordinates=com.daml:metrics-test-lib:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = [
         "//visibility:public",
     ],
@@ -83,9 +77,6 @@ da_scala_test_suite(
         "@maven//:org_scalatest_scalatest_shouldmatchers",
         "@maven//:org_scalatest_scalatest_wordspec",
     ],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     deps = [
         ":metrics",
         ":metrics-test-lib",

diff --git a/ledger/participant-integration-api/BUILD.bazel b/ledger/participant-integration-api/BUILD.bazel
@@ -438,12 +438,6 @@ da_scala_binary(
         "@maven//:io_circe_circe_yaml",
         "@maven//:io_circe_circe_core",
     ],
-    versioned_scala_deps = {
-        "2.12": [
-            "@maven//:org_typelevel_cats_core",
-            "@maven//:org_typelevel_cats_kernel",
-        ],
-    },
     visibility = ["//visibility:public"],
     deps = [
         ":participant-integration-api",

diff --git a/libs-scala/build-info/BUILD.bazel b/libs-scala/build-info/BUILD.bazel
@@ -13,9 +13,6 @@ da_scala_library(
         "//:mvn_version_file",
     ],
     tags = ["maven_coordinates=com.daml:build-info:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = [
         "//:__subpackages__",
     ],

diff --git a/libs-scala/contextualized-logging/BUILD.bazel b/libs-scala/contextualized-logging/BUILD.bazel
@@ -17,9 +17,6 @@ da_scala_library(
     ],
     scalacopts = ["-Xsource:2.13"],
     tags = ["maven_coordinates=com.daml:contextualized-logging:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = [
         "//visibility:public",
     ],

diff --git a/libs-scala/flyway-testing/BUILD.bazel b/libs-scala/flyway-testing/BUILD.bazel
@@ -14,9 +14,6 @@ da_scala_library(
         "@maven//:org_scalatest_scalatest_wordspec",
     ],
     tags = ["maven_coordinates=com.daml:flyway-testing:__VERSION__"],
-    versioned_scala_deps = {
-        "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"],
-    },
     visibility = ["//visibility:public"],
     deps = [
         "@maven//:org_flywaydb_flyway_core",