From 109637f25af29baa6f60a3b4d9c709e4ad6c0613 Mon Sep 17 00:00:00 2001 From: Natan Silnitsky Date: Sat, 4 Feb 2023 15:58:46 +0200 Subject: [PATCH] switch scala version + jar deps to 2.13 --- core/BUILD.bazel | 16 +++---- .../wixpress/dst/greyhound/core/BUILD.bazel | 12 ++--- .../dst/greyhound/core/batched/BUILD.bazel | 8 ++-- .../dst/greyhound/core/offset/BUILD.bazel | 8 ++-- .../dst/greyhound/core/rabalance/BUILD.bazel | 8 ++-- .../dst/greyhound/core/retry/BUILD.bazel | 8 ++-- .../dst/greyhound/testenv/BUILD.bazel | 12 ++--- .../dst/greyhound/testkit/BUILD.bazel | 10 ++--- .../wixpress/dst/greyhound/core/BUILD.bazel | 6 +-- .../dst/greyhound/core/admin/BUILD.bazel | 6 +-- .../dst/greyhound/core/consumer/BUILD.bazel | 10 ++--- .../core/consumer/batched/BUILD.bazel | 8 ++-- .../core/consumer/domain/BUILD.bazel | 8 ++-- .../greyhound/core/consumer/retry/BUILD.bazel | 6 +-- .../dst/greyhound/core/metrics/BUILD.bazel | 8 ++-- .../dst/greyhound/core/producer/BUILD.bazel | 10 ++--- .../dst/greyhound/core/zioutils/BUILD.bazel | 8 ++-- .../dst/greyhound/core/consumer/BUILD.bazel | 16 +++---- .../core/consumer/batched/BUILD.bazel | 14 +++--- .../core/consumer/dispatcher/BUILD.bazel | 10 ++--- .../greyhound/core/consumer/retry/BUILD.bazel | 10 ++--- .../dst/greyhound/core/producer/BUILD.bazel | 14 +++--- .../greyhound/core/serialization/BUILD.bazel | 4 +- .../dst/greyhound/core/testkit/BUILD.bazel | 24 +++++----- dependencies/rules_scala/BUILD.bazel | 17 ++++--- future-interop/BUILD.bazel | 6 +-- .../wixpress/dst/greyhound/future/BUILD.bazel | 6 +-- .../wixpress/dst/greyhound/future/BUILD.bazel | 8 ++-- java-interop/BUILD.bazel | 8 ++-- .../wixpress/dst/greyhound/scala/BUILD.bazel | 8 ++-- .../dst/greyhound/java/testkit/BUILD.bazel | 4 +- third_party.bzl | 44 ++++++++++--------- tools/build_rules/prelude_bazel | 4 +- 33 files changed, 176 insertions(+), 173 deletions(-) diff --git a/core/BUILD.bazel b/core/BUILD.bazel index cdc03814..c07c598e 100644 --- a/core/BUILD.bazel +++ b/core/BUILD.bazel @@ -21,11 +21,11 @@ scala_library( ], visibility = ["//:__subpackages__"], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_managed_2_12", - "@dev_zio_zio_stacktracer_2_12", - "@dev_zio_zio_streams_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), + "@dev_zio_zio_streams_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", "@org_slf4j_slf4j_api", ], @@ -81,10 +81,10 @@ scala_library( visibility = ["//:__subpackages__"], deps = [ "//core:greyhound-core", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "@org_apache_curator_curator_test", - "@org_apache_kafka_kafka_2_12", + "@org_apache_kafka_kafka_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", "@org_slf4j_slf4j_api", ], diff --git a/core/src/it/scala/com/wixpress/dst/greyhound/core/BUILD.bazel b/core/src/it/scala/com/wixpress/dst/greyhound/core/BUILD.bazel index 28d79c08..816ec598 100644 --- a/core/src/it/scala/com/wixpress/dst/greyhound/core/BUILD.bazel +++ b/core/src/it/scala/com/wixpress/dst/greyhound/core/BUILD.bazel @@ -10,8 +10,8 @@ specs2_ite2e_test( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "//core/src/it/resources", "//core/src/it/scala/com/wixpress/dst/greyhound/testenv", "//core/src/it/scala/com/wixpress/dst/greyhound/testkit", @@ -27,10 +27,10 @@ specs2_ite2e_test( #"//core/src/test/scala/com/wixpress/dst/greyhound/core/consumer", #"//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", "@ch_qos_logback_logback_classic", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_test_2_12", - "@org_apache_kafka_kafka_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), + "@org_apache_kafka_kafka_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", ], diff --git a/core/src/it/scala/com/wixpress/dst/greyhound/core/batched/BUILD.bazel b/core/src/it/scala/com/wixpress/dst/greyhound/core/batched/BUILD.bazel index 89c26dfa..d9f17da8 100644 --- a/core/src/it/scala/com/wixpress/dst/greyhound/core/batched/BUILD.bazel +++ b/core/src/it/scala/com/wixpress/dst/greyhound/core/batched/BUILD.bazel @@ -13,8 +13,8 @@ specs2_ite2e_test( "-Dwix.app.version=fixed.version-SNAPSHOT", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "//core/src/it/resources", "//core/src/it/scala/com/wixpress/dst/greyhound/testenv", "//core/src/it/scala/com/wixpress/dst/greyhound/testkit", @@ -26,8 +26,8 @@ specs2_ite2e_test( "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/it/scala/com/wixpress/dst/greyhound/core/offset/BUILD.bazel b/core/src/it/scala/com/wixpress/dst/greyhound/core/offset/BUILD.bazel index ce9f7faf..f3621927 100644 --- a/core/src/it/scala/com/wixpress/dst/greyhound/core/offset/BUILD.bazel +++ b/core/src/it/scala/com/wixpress/dst/greyhound/core/offset/BUILD.bazel @@ -10,8 +10,8 @@ specs2_ite2e_test( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "//core/src/it/resources", "//core/src/it/scala/com/wixpress/dst/greyhound/core", "//core/src/it/scala/com/wixpress/dst/greyhound/testenv", @@ -26,8 +26,8 @@ specs2_ite2e_test( "//core/src/test/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", "@ch_qos_logback_logback_classic", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/it/scala/com/wixpress/dst/greyhound/core/rabalance/BUILD.bazel b/core/src/it/scala/com/wixpress/dst/greyhound/core/rabalance/BUILD.bazel index 3da73eba..9dd97d3a 100644 --- a/core/src/it/scala/com/wixpress/dst/greyhound/core/rabalance/BUILD.bazel +++ b/core/src/it/scala/com/wixpress/dst/greyhound/core/rabalance/BUILD.bazel @@ -10,8 +10,8 @@ specs2_ite2e_test( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "//core/src/it/resources", "//core/src/it/scala/com/wixpress/dst/greyhound/core", "//core/src/it/scala/com/wixpress/dst/greyhound/testenv", @@ -26,8 +26,8 @@ specs2_ite2e_test( "//core/src/test/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", "@ch_qos_logback_logback_classic", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/it/scala/com/wixpress/dst/greyhound/core/retry/BUILD.bazel b/core/src/it/scala/com/wixpress/dst/greyhound/core/retry/BUILD.bazel index 3f83ff43..b9ad44ff 100644 --- a/core/src/it/scala/com/wixpress/dst/greyhound/core/retry/BUILD.bazel +++ b/core/src/it/scala/com/wixpress/dst/greyhound/core/retry/BUILD.bazel @@ -10,8 +10,8 @@ specs2_ite2e_test( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "//core/src/it/scala/com/wixpress/dst/greyhound/core", "//core/src/it/scala/com/wixpress/dst/greyhound/testenv", "//core/src/it/scala/com/wixpress/dst/greyhound/testkit", @@ -26,8 +26,8 @@ specs2_ite2e_test( "//core/src/test/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", "@ch_qos_logback_logback_classic", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/it/scala/com/wixpress/dst/greyhound/testenv/BUILD.bazel b/core/src/it/scala/com/wixpress/dst/greyhound/testenv/BUILD.bazel index 35ab06f9..7585fac9 100644 --- a/core/src/it/scala/com/wixpress/dst/greyhound/testenv/BUILD.bazel +++ b/core/src/it/scala/com/wixpress/dst/greyhound/testenv/BUILD.bazel @@ -9,19 +9,19 @@ scala_library( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "//core/src/it/scala/com/wixpress/dst/greyhound/testkit", "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/admin", "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_test_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), "@org_apache_curator_curator_test", - "@org_apache_kafka_kafka_2_12", + "@org_apache_kafka_kafka_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/it/scala/com/wixpress/dst/greyhound/testkit/BUILD.bazel b/core/src/it/scala/com/wixpress/dst/greyhound/testkit/BUILD.bazel index fb990677..b54cadd9 100644 --- a/core/src/it/scala/com/wixpress/dst/greyhound/testkit/BUILD.bazel +++ b/core/src/it/scala/com/wixpress/dst/greyhound/testkit/BUILD.bazel @@ -8,17 +8,17 @@ scala_library( srcs = [ ":sources", ], - plugins = ["@com_kubukoz_better_tostring_2_12"], + plugins = ["@com_kubukoz_better_tostring_{}".format(scala_version_dependency)], deps = [ - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/admin", "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", # "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", - "@dev_zio_zio_2_12", - "@dev_zio_zio_test_2_12", + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), "@org_apache_curator_curator_test", - "@org_apache_kafka_kafka_2_12", + "@org_apache_kafka_kafka_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/BUILD.bazel index abc6421b..ae05973a 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/BUILD.bazel @@ -8,10 +8,10 @@ scala_library( srcs = [ ":sources", ], - plugins = ["@com_kubukoz_better_tostring_2_12"], + plugins = ["@com_kubukoz_better_tostring_{}".format(scala_version_dependency)], deps = [ - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/admin/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/admin/BUILD.bazel index 0cdb4d17..b1f0c8e5 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/admin/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/admin/BUILD.bazel @@ -12,9 +12,9 @@ scala_library( "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", - # "@org_apache_kafka_kafka_2_12", + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), + # "@org_apache_kafka_kafka_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/BUILD.bazel index 007b00c7..baa2b0e3 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/BUILD.bazel @@ -8,10 +8,10 @@ scala_library( srcs = [ ":sources", ], - plugins = ["@com_kubukoz_better_tostring_2_12"], + plugins = ["@com_kubukoz_better_tostring_{}".format(scala_version_dependency)], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/admin", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain", @@ -19,8 +19,8 @@ scala_library( "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/batched/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/batched/BUILD.bazel index a0115bca..fa91fe25 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/batched/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/batched/BUILD.bazel @@ -8,16 +8,16 @@ scala_library( srcs = [ ":sources", ], - plugins = ["@com_kubukoz_better_tostring_2_12"], + plugins = ["@com_kubukoz_better_tostring_{}".format(scala_version_dependency)], deps = [ - "@dev_zio_izumi_reflect_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/retry", "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain/BUILD.bazel index 8fc8b9e1..4976081c 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain/BUILD.bazel @@ -8,12 +8,12 @@ scala_library( srcs = [ ":sources", ], - plugins = ["@com_kubukoz_better_tostring_2_12"], + plugins = ["@com_kubukoz_better_tostring_{}".format(scala_version_dependency)], deps = [ "//core/src/main/scala/com/wixpress/dst/greyhound/core", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", - # "@org_apache_kafka_kafka_2_12", + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), + # "@org_apache_kafka_kafka_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/retry/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/retry/BUILD.bazel index d516a362..d1ab3f06 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/retry/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/retry/BUILD.bazel @@ -8,15 +8,15 @@ scala_library( srcs = [ ":sources", ], - plugins = ["@com_kubukoz_better_tostring_2_12"], + plugins = ["@com_kubukoz_better_tostring_{}".format(scala_version_dependency)], deps = [ "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain", "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/metrics/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/metrics/BUILD.bazel index d641a93b..6e42a283 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/metrics/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/metrics/BUILD.bazel @@ -9,10 +9,10 @@ scala_library( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", "@org_slf4j_slf4j_api", ], diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/producer/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/producer/BUILD.bazel index 4976ec04..6ba745ed 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/producer/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/producer/BUILD.bazel @@ -8,14 +8,14 @@ scala_library( srcs = [ ":sources", ], - plugins = ["@com_kubukoz_better_tostring_2_12"], + plugins = ["@com_kubukoz_better_tostring_{}".format(scala_version_dependency)], deps = [ - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_managed_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils/BUILD.bazel b/core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils/BUILD.bazel index b12a5cd4..f555d95c 100644 --- a/core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils/BUILD.bazel +++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils/BUILD.bazel @@ -9,11 +9,11 @@ scala_library( ":sources", ], deps = [ - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_managed_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/BUILD.bazel b/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/BUILD.bazel index 90ed4056..bd590da9 100644 --- a/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/BUILD.bazel +++ b/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/BUILD.bazel @@ -9,8 +9,8 @@ specs2_unit_test( ":sources", ], deps = [ - "@dev_zio_zio_managed_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_zio_managed_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "//core/src/it/scala/com/wixpress/dst/greyhound/testkit", "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer", @@ -22,13 +22,13 @@ specs2_unit_test( "//core/src/test/resources", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", "@ch_qos_logback_logback_classic", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_streams_2_12", - "@dev_zio_zio_test_2_12", - "@dev_zio_zio_test_junit_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_streams_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), + "@dev_zio_zio_test_junit_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", "@org_mockito_mockito_core", - "@org_specs2_specs2_mock_2_12", + "@org_specs2_specs2_mock_{}".format(scala_version_dependency), ], ) diff --git a/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/batched/BUILD.bazel b/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/batched/BUILD.bazel index 7cd532b7..18bf4ebb 100644 --- a/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/batched/BUILD.bazel +++ b/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/batched/BUILD.bazel @@ -8,8 +8,8 @@ specs2_unit_test( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/batched", @@ -17,10 +17,10 @@ specs2_unit_test( "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/test/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_streams_2_12", - "@dev_zio_zio_test_2_12", - "@dev_zio_zio_test_junit_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_streams_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), + "@dev_zio_zio_test_junit_{}".format(scala_version_dependency), ], ) diff --git a/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/dispatcher/BUILD.bazel b/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/dispatcher/BUILD.bazel index e341422b..d7ee28d8 100644 --- a/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/dispatcher/BUILD.bazel +++ b/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/dispatcher/BUILD.bazel @@ -9,16 +9,16 @@ specs2_unit_test( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain", "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_test_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), ], ) diff --git a/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/retry/BUILD.bazel b/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/retry/BUILD.bazel index b02990a0..dd83ee91 100644 --- a/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/retry/BUILD.bazel +++ b/core/src/test/scala/com/wixpress/dst/greyhound/core/consumer/retry/BUILD.bazel @@ -8,8 +8,8 @@ specs2_unit_test( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain", @@ -19,8 +19,8 @@ specs2_unit_test( "//core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils", "//core/src/test/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_test_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), ], ) diff --git a/core/src/test/scala/com/wixpress/dst/greyhound/core/producer/BUILD.bazel b/core/src/test/scala/com/wixpress/dst/greyhound/core/producer/BUILD.bazel index 27f12381..d50b01de 100644 --- a/core/src/test/scala/com/wixpress/dst/greyhound/core/producer/BUILD.bazel +++ b/core/src/test/scala/com/wixpress/dst/greyhound/core/producer/BUILD.bazel @@ -8,19 +8,19 @@ specs2_unit_test( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_managed_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", "//core/src/test/resources", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", "@ch_qos_logback_logback_classic", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_test_2_12", - "@dev_zio_zio_test_junit_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), + "@dev_zio_zio_test_junit_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/test/scala/com/wixpress/dst/greyhound/core/serialization/BUILD.bazel b/core/src/test/scala/com/wixpress/dst/greyhound/core/serialization/BUILD.bazel index a46a9bb8..91422851 100644 --- a/core/src/test/scala/com/wixpress/dst/greyhound/core/serialization/BUILD.bazel +++ b/core/src/test/scala/com/wixpress/dst/greyhound/core/serialization/BUILD.bazel @@ -10,8 +10,8 @@ specs2_unit_test( deps = [ "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/test/scala/com/wixpress/dst/greyhound/core/testkit", - "@dev_zio_zio_2_12", - "@dev_zio_zio_managed_2_12", + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/core/src/test/scala/com/wixpress/dst/greyhound/core/testkit/BUILD.bazel b/core/src/test/scala/com/wixpress/dst/greyhound/core/testkit/BUILD.bazel index 17c68cef..9a783844 100644 --- a/core/src/test/scala/com/wixpress/dst/greyhound/core/testkit/BUILD.bazel +++ b/core/src/test/scala/com/wixpress/dst/greyhound/core/testkit/BUILD.bazel @@ -8,7 +8,7 @@ scala_library( ":sources", ], deps = [ - "@dev_zio_izumi_reflect_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/domain", @@ -16,17 +16,17 @@ scala_library( "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils", - # "@dev_zio_izumi_reflect_2_12", - # "@dev_zio_izumi_reflect_thirdparty_boopickle_shaded_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_managed_2_12", - "@dev_zio_zio_streams_2_12", - "@dev_zio_zio_test_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + # "@dev_zio_izumi_reflect_thirdparty_boopickle_shaded_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_managed_{}".format(scala_version_dependency), + "@dev_zio_zio_streams_{}".format(scala_version_dependency), + "@dev_zio_zio_test_{}".format(scala_version_dependency), "@org_slf4j_slf4j_api", - "@org_specs2_specs2_common_2_12", - "@org_specs2_specs2_core_2_12", - "@org_specs2_specs2_fp_2_12", - "@org_specs2_specs2_junit_2_12", - "@org_specs2_specs2_matcher_2_12", + "@org_specs2_specs2_common_{}".format(scala_version_dependency), + "@org_specs2_specs2_core_{}".format(scala_version_dependency), + "@org_specs2_specs2_fp_{}".format(scala_version_dependency), + "@org_specs2_specs2_junit_{}".format(scala_version_dependency), + "@org_specs2_specs2_matcher_{}".format(scala_version_dependency), ], ) diff --git a/dependencies/rules_scala/BUILD.bazel b/dependencies/rules_scala/BUILD.bazel index 3fa5756f..cc92a265 100644 --- a/dependencies/rules_scala/BUILD.bazel +++ b/dependencies/rules_scala/BUILD.bazel @@ -1,10 +1,11 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "setup_scala_testing_toolchain", "setup_scala_toolchain") + setup_scala_toolchain( name = "scala_toolchain", dependency_mode = "plus-one", parser_combinators_deps = [ - "@maven//:org_scala_lang_modules_scala_parser_combinators_2_12", + "@maven//:org_scala_lang_modules_scala_parser_combinators_{}".format(scala_version_dependency), ], scala_compile_classpath = [ "@maven//:org_scala_lang_scala_compiler", @@ -20,15 +21,13 @@ setup_scala_toolchain( "@maven//:org_scala_lang_scala_reflect", ], scala_xml_deps = [ - "@maven//:org_scala_lang_modules_scala_xml_2_12", + "@maven//:org_scala_lang_modules_scala_xml_{}".format(scala_version_dependency), ], scalacopts = [ "-unchecked", "-deprecation", "-feature", - "-Xmax-classfile-name", "240", - "-Ywarn-unused-import", "-Ywarn-unused", "-Ywarn-macros:after", ], @@ -42,13 +41,13 @@ setup_scala_testing_toolchain( "@maven//:org_hamcrest_hamcrest_core", ], specs2_classpath = [ - "@maven//:org_specs2_specs2_common_2_12", - "@maven//:org_specs2_specs2_core_2_12", - "@maven//:org_specs2_specs2_fp_2_12", - "@maven//:org_specs2_specs2_matcher_2_12", + "@maven//:org_specs2_specs2_common_{}".format(scala_version_dependency), + "@maven//:org_specs2_specs2_core_{}".format(scala_version_dependency), + "@maven//:org_specs2_specs2_fp_{}".format(scala_version_dependency), + "@maven//:org_specs2_specs2_matcher_{}".format(scala_version_dependency), ], specs2_junit_classpath = [ - "@maven//:org_specs2_specs2_junit_2_12", + "@maven//:org_specs2_specs2_junit_{}".format(scala_version_dependency), ], visibility = ["//visibility:public"], ) diff --git a/future-interop/BUILD.bazel b/future-interop/BUILD.bazel index bf15d636..a69051f0 100644 --- a/future-interop/BUILD.bazel +++ b/future-interop/BUILD.bazel @@ -14,9 +14,9 @@ scala_library( visibility = ["//visibility:public"], deps = [ "//core:greyhound-core", - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), ], ) diff --git a/future-interop/src/it/scala/com/wixpress/dst/greyhound/future/BUILD.bazel b/future-interop/src/it/scala/com/wixpress/dst/greyhound/future/BUILD.bazel index 45e8069e..6c10b29b 100644 --- a/future-interop/src/it/scala/com/wixpress/dst/greyhound/future/BUILD.bazel +++ b/future-interop/src/it/scala/com/wixpress/dst/greyhound/future/BUILD.bazel @@ -23,9 +23,9 @@ specs2_ite2e_test( "//future-interop/src/main/scala/com/wixpress/dst/greyhound/future", "//java-interop/src/main/java/com/wixpress/dst/greyhound/java", "@ch_qos_logback_logback_classic", - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/future-interop/src/main/scala/com/wixpress/dst/greyhound/future/BUILD.bazel b/future-interop/src/main/scala/com/wixpress/dst/greyhound/future/BUILD.bazel index fde77de2..66a65a1f 100644 --- a/future-interop/src/main/scala/com/wixpress/dst/greyhound/future/BUILD.bazel +++ b/future-interop/src/main/scala/com/wixpress/dst/greyhound/future/BUILD.bazel @@ -13,8 +13,8 @@ scala_library( "no-tool", ], deps = [ - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), "//core/src/main/scala/com/wixpress/dst/greyhound/core", "//core/src/main/scala/com/wixpress/dst/greyhound/core/admin", "//core/src/main/scala/com/wixpress/dst/greyhound/core/consumer", @@ -23,7 +23,7 @@ scala_library( "//core/src/main/scala/com/wixpress/dst/greyhound/core/metrics", "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", "//core/src/main/scala/com/wixpress/dst/greyhound/core/zioutils", - # "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", + # "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), ], ) diff --git a/java-interop/BUILD.bazel b/java-interop/BUILD.bazel index ad506bb7..9fbb1241 100644 --- a/java-interop/BUILD.bazel +++ b/java-interop/BUILD.bazel @@ -33,10 +33,10 @@ scala_library( "//core:greyhound-core", "//future-interop:greyhound-future", "//java-interop:greyhound-java-core", - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", - "@dev_zio_zio_streams_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), + "@dev_zio_zio_streams_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/java-interop/src/main/java/com/wixpress/dst/greyhound/scala/BUILD.bazel b/java-interop/src/main/java/com/wixpress/dst/greyhound/scala/BUILD.bazel index a6e4987d..c50fe259 100644 --- a/java-interop/src/main/java/com/wixpress/dst/greyhound/scala/BUILD.bazel +++ b/java-interop/src/main/java/com/wixpress/dst/greyhound/scala/BUILD.bazel @@ -22,10 +22,10 @@ scala_library( "//core/src/main/scala/com/wixpress/dst/greyhound/core/producer", "//future-interop/src/main/scala/com/wixpress/dst/greyhound/future", "//java-interop/src/main/java/com/wixpress/dst/greyhound/java", - "@dev_zio_izumi_reflect_2_12", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", - "@dev_zio_zio_streams_2_12", + "@dev_zio_izumi_reflect_{}".format(scala_version_dependency), + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), + "@dev_zio_zio_streams_{}".format(scala_version_dependency), "@org_apache_kafka_kafka_clients", ], ) diff --git a/java-interop/src/test/java/com/wixpress/dst/greyhound/java/testkit/BUILD.bazel b/java-interop/src/test/java/com/wixpress/dst/greyhound/java/testkit/BUILD.bazel index e9e519e8..690f96ff 100644 --- a/java-interop/src/test/java/com/wixpress/dst/greyhound/java/testkit/BUILD.bazel +++ b/java-interop/src/test/java/com/wixpress/dst/greyhound/java/testkit/BUILD.bazel @@ -16,7 +16,7 @@ scala_library( "//future-interop/src/main/scala/com/wixpress/dst/greyhound/future", "//java-interop/src/main/java/com/wixpress/dst/greyhound/java", "//java-interop/src/main/java/com/wixpress/dst/greyhound/scala", - "@dev_zio_zio_2_12", - "@dev_zio_zio_stacktracer_2_12", + "@dev_zio_zio_{}".format(scala_version_dependency), + "@dev_zio_zio_stacktracer_{}".format(scala_version_dependency), ], ) diff --git a/third_party.bzl b/third_party.bzl index b14604d5..70cb959d 100644 --- a/third_party.bzl +++ b/third_party.bzl @@ -14,7 +14,9 @@ def dependency(coordinates,exclusions=None): exclusions = exclusions, ) -scala_version = "2.12.12" +scala_version = "2.13.10" + +scala_version_dependency = "2.13" deps = [ dependency("com.google.protobuf:protobuf-java:3.21.10"), @@ -33,39 +35,39 @@ deps = [ dependency("com.typesafe.scala-logging:scala-logging_2.12:3.8.0"), dependency("com.yammer.metrics:metrics-core:2.2.0"), dependency("commons-cli:commons-cli:1.4"), - dependency("dev.zio:zio_2.12:2.0.2"), - dependency("dev.zio:zio-stacktracer_2.12:2.0.2"), - dependency("dev.zio:zio-streams_2.12:2.0.2"), - dependency("dev.zio:zio-managed_2.12:2.0.2"), - dependency("dev.zio:zio-test_2.12:2.0.2"), - dependency("dev.zio:zio-test-junit_2.12:2.0.2"), + dependency("dev.zio:zio_{}:2.0.2".format(scala_version_dependency)), + dependency("dev.zio:zio-stacktracer_{}:2.0.2".format(scala_version_dependency)), + dependency("dev.zio:zio-streams_{}:2.0.2".format(scala_version_dependency)), + dependency("dev.zio:zio-managed_{}:2.0.2".format(scala_version_dependency)), + dependency("dev.zio:zio-test_{}:2.0.2".format(scala_version_dependency)), + dependency("dev.zio:zio-test-junit_{}:2.0.2".format(scala_version_dependency)), dependency("junit:junit:4.13"), dependency("net.sf.jopt-simple:jopt-simple:5.0.4"), dependency("org.apache.curator:curator-test:2.12.0"), - dependency("org.apache.kafka:kafka_2.12:2.4.1"), + dependency("org.apache.kafka:kafka_{}:2.4.1".format(scala_version_dependency)), dependency("org.apache.kafka:kafka-clients:2.4.1"), dependency("org.apache.zookeeper:zookeeper:3.4.10"), dependency("org.hamcrest:hamcrest-core:1.3"), dependency("org.javassist:javassist:3.18.1-GA"), dependency("org.lz4:lz4-java:1.6.0"), - dependency("org.portable-scala:portable-scala-reflect_2.12:0.1.0"), - dependency("org.scala-lang.modules:scala-collection-compat_2.12:2.1.2"), + dependency("org.portable-scala:portable-scala-reflect_{}:0.1.0".format(scala_version_dependency)), + dependency("org.scala-lang.modules:scala-collection-compat_{}:2.1.2".format(scala_version_dependency)), dependency("org.scala-lang:scala-compiler:" + scala_version), - dependency("org.scala-lang.modules:scala-parser-combinators_2.12:1.0.6"), - dependency("org.scala-lang.modules:scala-xml_2.12:1.1.0"), + dependency("org.scala-lang.modules:scala-parser-combinators_{}:1.1.2".format(scala_version_dependency)), + dependency("org.scala-lang.modules:scala-xml_{}:1.2.0".format(scala_version_dependency)), dependency("org.scala-lang:scala-library:" + scala_version), dependency("org.scala-lang:scala-reflect:" + scala_version), dependency("org.scala-sbt:test-interface:1.0"), dependency("org.slf4j:slf4j-api:1.7.25"), - dependency("org.specs2:specs2-common_2.12:4.8.3"), - dependency("org.specs2:specs2-core_2.12:4.8.3"), - dependency("org.specs2:specs2-fp_2.12:4.8.3"), - dependency("org.specs2:specs2-junit_2.12:4.8.3"), - dependency("org.specs2:specs2-matcher_2.12:4.8.3"), - dependency("org.specs2:specs2-mock_2.12:4.8.3"), + dependency("org.specs2:specs2-common_{}:4.8.3".format(scala_version_dependency)), + dependency("org.specs2:specs2-core_{}:4.8.3".format(scala_version_dependency)), + dependency("org.specs2:specs2-fp_{}:4.8.3".format(scala_version_dependency)), + dependency("org.specs2:specs2-junit_{}:4.8.3".format(scala_version_dependency)), + dependency("org.specs2:specs2-matcher_{}:4.8.3".format(scala_version_dependency)), + dependency("org.specs2:specs2-mock_{}:4.8.3".format(scala_version_dependency)), dependency("org.xerial.snappy:snappy-java:1.1.7.1"), dependency("net.openhft:chronicle-queue:5.20.123"), - dependency("com.kubukoz:better-tostring_" + scala_version +":0.2.4"), + dependency("com.kubukoz:better-tostring_2.13.6:0.3.7"), ] def dependencies(): @@ -82,7 +84,7 @@ def dependencies(): # this is a compiler plugin with full scala version in its maven artifact name # so we create an alias without the minor scala version import_external_alias( - name = "com_kubukoz_better_tostring_2_12", - actual = "@maven//:com_kubukoz_better_tostring_" + scala_version.replace(".", "_"), + name = "com_kubukoz_better_tostring_{}".format(scala_version_dependency.replace(".", "_")), + actual = "@maven//:com_kubukoz_better_tostring_" + "2.13.6".replace(".", "_"), ) diff --git a/tools/build_rules/prelude_bazel b/tools/build_rules/prelude_bazel index 8e4acbdc..bea49259 100644 --- a/tools/build_rules/prelude_bazel +++ b/tools/build_rules/prelude_bazel @@ -9,4 +9,6 @@ load( load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import",) load("//:tests.bzl", "specs2_unit_test", "specs2_ite2e_test", "specs2_mixed_test") -load("//:macros.bzl", "sources") \ No newline at end of file +load("//:macros.bzl", "sources") + +scala_version_dependency = "2_13"