Switch to scala 2.13!

Author: dkomanov

WORKSPACE

@@ -1,14 +1,17 @@
 workspace(name = "stuff")
 
-scala_version = "2.12"
-scala_full_version = "%s.10" % scala_version
+scala_version = "2.13"
 
-rules_scala_version = "3dd5d8110d56cfc19722532866cbfc039a6a9612"
+scala_full_version = "%s.6" % scala_version
+
+rules_scala_version = "972fdf2b3bda64138db34a630a9910eee96b4d8a"
 
 rules_jvm_external_tag = "3.2"
+
 rules_jvm_external_sha = "82262ff4223c5fda6fb7ff8bd63db8131b51b413d26eb49e3131037e79e324af"
 
 protobuf_version = "204f99488ce1ef74565239cf3963111ae4c774b7"
+
 protobuf_version_sha256 = "98e76e0d31146bf878160db65b2ec2d98db333db8730573c4efec987da83c877"
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -32,7 +35,9 @@ http_archive(
 )
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+
 rules_proto_dependencies()
+
 rules_proto_toolchains()
 
 http_archive(
@@ -50,43 +55,56 @@ http_archive(
 )
 
 skylib_version = "1.0.3"
+
 http_archive(
     name = "bazel_skylib",
     sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
     type = "tar.gz",
     url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
 )
+
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+
 bazel_skylib_workspace()
 
 register_toolchains("//tools:default_scala_toolchain")
 
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
+
 scala_config(scala_version = scala_full_version)
 
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
+
 scala_repositories(fetch_sources = True)
 
 load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
+
 scala_register_toolchains()
 
 load("@io_bazel_rules_scala//testing:specs2_junit.bzl", "specs2_junit_repositories", "specs2_junit_toolchain")
+
 specs2_junit_repositories()
+
 specs2_junit_toolchain()
 
 load("@io_bazel_rules_scala//jmh:jmh.bzl", "jmh_repositories")
+
 jmh_repositories()
 
 load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scala_proto_repositories")
+
 scala_proto_repositories()
 
 load("@io_bazel_rules_scala//scala_proto:toolchains.bzl", "scala_proto_register_toolchains")
+
 scala_proto_register_toolchains()
 
 load("@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")
+
 twitter_scrooge()
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
+
 maven_repositories = ["https://repo1.maven.org/maven2"]
 
 maven_install(
@@ -121,13 +139,13 @@ maven_install(
         "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9",
         "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.9",
         "com.fasterxml.jackson.module:jackson-module-scala_%s:2.9.9" % scala_version,
-        "io.suzaku:boopickle_%s:1.3.0" % scala_version,
-        "com.twitter:chill_%s:0.9.2" % scala_version,
+        "io.suzaku:boopickle_%s:1.3.3" % scala_version,
+        "com.twitter:chill_%s:0.9.5" % scala_version,
         "org.apache.thrift:libthrift:0.10.0",
-        "io.circe:circe-core_%s:0.11.1" % scala_version,
-        "io.circe:circe-generic_%s:0.11.1" % scala_version,
-        "io.circe:circe-parser_%s:0.11.1" % scala_version,
-        "com.github.plokhotnyuk.jsoniter-scala:jsoniter-scala-macros_%s:0.52.2" % scala_version,
+        "io.circe:circe-core_%s:0.14.2" % scala_version,
+        "io.circe:circe-generic_%s:0.14.2" % scala_version,
+        "io.circe:circe-parser_%s:0.14.2" % scala_version,
+        "com.github.plokhotnyuk.jsoniter-scala:jsoniter-scala-macros_%s:2.13.38" % scala_version,
         "com.google.protobuf:protobuf-java:3.10.0",
         "javax.annotation:javax.annotation-api:1.3.2",
     ],

src/com/komanov/collection/jmh/README.md

@@ -2,4 +2,5 @@
 
 ```
 scripts/run-jmh.sh //src/com/komanov/collection/jmh:jmh set-map-java-vs-scala-2-12
+scripts/run-jmh.sh //src/com/komanov/collection/jmh:jmh set-map-java-vs-scala-2-13
 ```

src/com/komanov/collection/jmh/SetMapJavaVsScalaBenchmarks.scala

@@ -5,7 +5,7 @@ import org.openjdk.jmh.annotations._
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 import java.util.stream.{Collectors, IntStream}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable
 import scala.util.Random
 

src/com/komanov/io/tests/BUILD

@@ -4,6 +4,6 @@ scala_specs2_junit(
     deps = [
         "//src/com/komanov/io",
         "@maven//:org_mockito_mockito_core",
-        "@maven//:org_specs2_specs2_mock_2_12",
+        "@maven//:org_specs2_specs2_mock_2_13",
     ],
 )

src/com/komanov/junk/mockito/BUILD

@@ -3,6 +3,6 @@ scala_specs2_junit(
     srcs = glob(["*.scala"]),
     deps = [
         "@maven//:org_mockito_mockito_core",
-        "@maven//:org_specs2_specs2_mock_2_12",
+        "@maven//:org_specs2_specs2_mock_2_13",
     ],
 )

src/com/komanov/junk/mockito/MockitoAndMutableTest.scala

@@ -23,7 +23,7 @@ class MockitoAndMutableTest extends SpecificationWithJUnit with Mockito {
     "replace 'a' with 'ab' in a JMock way" in new ctx {
       override def makeDao = mock[ContainerDao].defaultAnswer(i => throw new IllegalStateException(s"Unexpected call: $i"))
 
-      doAnswer(_ => {}).when(dao).update(beModifiedContainer)
+      doAnswer((_: Any) => {}).when(dao).update(beModifiedContainer)
 
       manager.doBusiness(container)
       container must beModifiedContainer

src/com/komanov/junk/mockito/RespondExtensionTest.scala

@@ -2,6 +2,6 @@ scala_specs2_junit(
     name = "option_getorelse",
     srcs = glob(["*.scala"]),
     deps = [
-        "@maven//:org_specs2_specs2_mock_2_12",
+        "@maven//:org_specs2_specs2_mock_2_13",
     ],
 )

src/com/komanov/junk/option_getorelse/BUILD

@@ -20,17 +20,17 @@ class ReadLinesUtilsTest extends SpecificationWithJUnit {
     IterateTestCase("readBytesOwnLineSplit", path => ReadLinesUtils.readBytesOwnLineSplit(path).asScala.toList),
     IterateTestCase("readBytesAndCustomUtf8Decoder", path => {
       val result = List.newBuilder[String]
-      ReadLinesUtils.readBytesAndCustomUtf8Decoder(path, result.+=)
+      ReadLinesUtils.readBytesAndCustomUtf8Decoder(path, s => result += s)
       result.result()
     }),
     IterateTestCase("bufferedInputStreamAndCustomUtf8Decoder", path => {
       val result = List.newBuilder[String]
-      ReadLinesUtils.bufferedInputStreamAndCustomUtf8Decoder(path, result.+=)
+      ReadLinesUtils.bufferedInputStreamAndCustomUtf8Decoder(path, s => result += s)
       result.result()
     }),
     IterateTestCase("forEachLine", path => {
       val result = List.newBuilder[String]
-      ReadLinesUtils.forEachLine(path, result.+=)
+      ReadLinesUtils.forEachLine(path, s => result += s)
       result.result()
     }),
     IterateTestCase("forEachJava", path => {

src/com/komanov/readlines/tests/ReadLinesUtilsTest.scala

@@ -29,7 +29,7 @@ scala_macro_library(
     srcs = ["BoopickleConverter.scala"],
     deps = [
         "//src/com/komanov/serialization/converters/api",
-        "@scala_serialization_maven//:io_suzaku_boopickle_2_12",
+        "@scala_serialization_maven//:io_suzaku_boopickle_2_13",
     ],
 )
 
@@ -38,7 +38,7 @@ scala_library(
     srcs = ["ChillConverter.scala"],
     deps = [
         "//src/com/komanov/serialization/converters/api",
-        "@scala_serialization_maven//:com_twitter_chill_2_12",
+        "@scala_serialization_maven//:com_twitter_chill_2_13",
         "@scala_serialization_maven//:com_twitter_chill_java",
     ],
 )
@@ -48,13 +48,11 @@ scala_library(
     srcs = ["CirceConverter.scala"],
     deps = [
         "//src/com/komanov/serialization/converters/api",
-        "@scala_serialization_maven//:com_chuusai_shapeless_2_12",
-        "@scala_serialization_maven//:io_circe_circe_core_2_12",
-        "@scala_serialization_maven//:io_circe_circe_generic_2_12",
-        "@scala_serialization_maven//:io_circe_circe_parser_2_12",
-        "@scala_serialization_maven//:org_typelevel_cats_core_2_12",
-        "@scala_serialization_maven//:org_typelevel_cats_macros_2_12",
-        "@scala_serialization_maven//:org_typelevel_machinist_2_12",
+        "@scala_serialization_maven//:com_chuusai_shapeless_2_13",
+        "@scala_serialization_maven//:io_circe_circe_core_2_13",
+        "@scala_serialization_maven//:io_circe_circe_generic_2_13",
+        "@scala_serialization_maven//:io_circe_circe_parser_2_13",
+        "@scala_serialization_maven//:org_typelevel_cats_core_2_13",
     ],
 )
 
@@ -111,7 +109,7 @@ scala_library(
         "@scala_serialization_maven//:com_fasterxml_jackson_core_jackson_databind",
         "@scala_serialization_maven//:com_fasterxml_jackson_dataformat_jackson_dataformat_cbor",
         "@scala_serialization_maven//:com_fasterxml_jackson_dataformat_jackson_dataformat_smile",
-        "@scala_serialization_maven//:com_fasterxml_jackson_module_jackson_module_scala_2_12",
+        "@scala_serialization_maven//:com_fasterxml_jackson_module_jackson_module_scala_2_13",
     ],
 )
 
@@ -120,8 +118,8 @@ scala_macro_library(
     srcs = ["JsoniterScalaConverter.scala"],
     deps = [
         "//src/com/komanov/serialization/converters/api",
-        "@scala_serialization_maven//:com_github_plokhotnyuk_jsoniter_scala_jsoniter_scala_core_2_12",
-        "@scala_serialization_maven//:com_github_plokhotnyuk_jsoniter_scala_jsoniter_scala_macros_2_12",
+        "@scala_serialization_maven//:com_github_plokhotnyuk_jsoniter_scala_jsoniter_scala_core_2_13",
+        "@scala_serialization_maven//:com_github_plokhotnyuk_jsoniter_scala_jsoniter_scala_macros_2_13",
     ],
 )