Upgrade scala 2.12.x and 2.13.x versions (#1515)

* Upgrade to Scala 2.13.11

* Upgrade to Scala 2.12.18

* Rename org_spire_math_kind_projector to org_typelevel_kind_projector

* Fix expected-coverage.dat files

Author: scoquelin

README.md

@@ -90,7 +90,7 @@ scalatest_toolchain()
 ```
 
 This will load the `rules_scala` repository at the commit sha
-`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.14)
+`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.18)
 
 Then in your BUILD file just add the following so the rules will be available:
 ```starlark
@@ -145,13 +145,13 @@ Previous minor versions may work but are supported only on a best effort basis.
 To configure Scala version you must call `scala_config(scala_version = "2.xx.xx")` and configure 
 dependencies by declaring [scala_toolchain](docs/scala_toolchain.md). 
 For a quick start you can use `scala_repositories()` and `scala_register_toolchains()`, which have 
-dependency providers configured for `2.11.12`, `2.12.14` and `2.13.6` versions.
+dependency providers configured for `2.11.12`, `2.12.18` and `2.13.11` versions.
 
 
 ```starlark
 # WORKSPACE
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
-scala_config(scala_version = "2.13.6")
+scala_config(scala_version = "2.13.11")
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
 rules_proto_dependencies()

WORKSPACE

@@ -197,7 +197,7 @@ repositories(
         # validated against it
         "org_springframework_spring_core",
         "org_springframework_spring_tx",
-        "org_spire_math_kind_projector",
+        "org_typelevel_kind_projector",
         # For testing that we don't include sources jars to the classpath
         "org_typelevel__cats_core",
     ],

dt_patches/dt_patch_test.sh

@@ -95,6 +95,8 @@ run_test_local test_compiler_patch 2.12.13
 run_test_local test_compiler_patch 2.12.14
 run_test_local test_compiler_patch 2.12.15
 run_test_local test_compiler_patch 2.12.16
+run_test_local test_compiler_patch 2.12.17
+run_test_local test_compiler_patch 2.12.18
 
 run_test_local test_compiler_patch 2.13.0
 run_test_local test_compiler_patch 2.13.1
@@ -105,6 +107,8 @@ run_test_local test_compiler_patch 2.13.5
 run_test_local test_compiler_patch 2.13.6
 run_test_local test_compiler_patch 2.13.7
 run_test_local test_compiler_patch 2.13.8
+run_test_local test_compiler_patch 2.13.10
+run_test_local test_compiler_patch 2.13.11
 
 run_test_local test_compiler_srcjar_error 2.12.11
 run_test_local test_compiler_srcjar_error 2.12.12
@@ -115,4 +119,5 @@ run_test_local test_compiler_srcjar_error 2.12.13
 run_test_local test_compiler_srcjar 2.12.14
 run_test_local test_compiler_srcjar 2.12.15
 run_test_local test_compiler_srcjar 2.12.16
-run_test_local test_compiler_srcjar_nonhermetic 2.12.17
+run_test_local test_compiler_srcjar_nonhermetic 2.12.17
+run_test_local test_compiler_srcjar_nonhermetic 2.12.18

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

@@ -88,6 +88,9 @@ srcjars_by_version = {
     "2.12.17": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.17/scala-compiler-2.12.17-sources.jar?foo",
     },
+    "2.12.18": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.18/scala-compiler-2.12.18-sources.jar?foo",
+    },
 }
 
 rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION])

scala_config.bzl

@@ -2,7 +2,7 @@ load("//scala:scala_cross_version.bzl", "extract_major_version", "extract_minor_
 
 def _default_scala_version():
     """return the scala version for use in maven coordinates"""
-    return "2.12.14"
+    return "2.12.18"
 
 def _validate_supported_scala_version(scala_major_version, scala_minor_version):
     if scala_major_version == "2.11" and int(scala_minor_version) != 12:

test/coverage_filename_encoding/expected-coverage.dat

@@ -9,14 +9,14 @@ FNDA:1,coverage_filename_encoding/A1$::a1 (Z)Ljava/lang/String;
 FNDA:0,coverage_filename_encoding/A1::a1 (Z)Ljava/lang/String;
 FNF:4
 FNH:3
-BRDA:5,0,0,0
-BRDA:5,0,1,1
+BRDA:5,0,0,1
+BRDA:5,0,1,0
 BRF:2
 BRH:1
 DA:3,1
 DA:5,1
-DA:6,1
+DA:6,0
 DA:7,1
-LH:4
+LH:3
 LF:4
 end_of_record

test/coverage_scalatest/expected-coverage.dat

@@ -9,15 +9,15 @@ FNDA:1,coverage_scalatest/A1$::a1 (Z)Lcoverage_scalatest/B1$;
 FNDA:0,coverage_scalatest/A1::a1 (Z)Lcoverage_scalatest/B1$;
 FNF:4
 FNH:3
-BRDA:5,0,0,0
-BRDA:5,0,1,1
+BRDA:5,0,0,1
+BRDA:5,0,1,0
 BRF:2
 BRH:1
 DA:3,1
 DA:5,1
-DA:6,1
+DA:6,0
 DA:7,1
-LH:4
+LH:3
 LF:4
 end_of_record
 SF:test/coverage_scalatest/A2.scala

test/coverage_specs2_with_junit/expected-coverage.dat

@@ -9,15 +9,15 @@ FNDA:1,coverage_specs2_with_junit/A1$::a1 (Z)Lcoverage_specs2_with_junit/B1$;
 FNDA:0,coverage_specs2_with_junit/A1::a1 (Z)Lcoverage_specs2_with_junit/B1$;
 FNF:4
 FNH:3
-BRDA:5,0,0,0
-BRDA:5,0,1,1
+BRDA:5,0,0,1
+BRDA:5,0,1,0
 BRF:2
 BRH:1
 DA:3,1
 DA:5,1
-DA:6,1
+DA:6,0
 DA:7,1
-LH:4
+LH:3
 LF:4
 end_of_record
 SF:test/coverage_specs2_with_junit/A2.scala

test/shell/test_scala_config.sh

@@ -6,13 +6,13 @@ runner=$(get_test_runner "${1:-local}")
 
 test_classpath_contains_2_12() {
   bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \
-   --repo_env=SCALA_VERSION=2.12.14 \
+   --repo_env=SCALA_VERSION=2.12.18 \
    | grep scala-library-2.12
 }
 
 test_classpath_contains_2_13() {
   bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \
-   --repo_env=SCALA_VERSION=2.13.6 \
+   --repo_env=SCALA_VERSION=2.13.11 \
    | grep scala-library-2.13
 }
 

test/src/main/scala/scalarules/test/compiler_plugin/BUILD.bazel

@@ -4,6 +4,6 @@ scala_library(
     name = "compiler_plugin",
     testonly = True,
     srcs = ["KindProjected.scala"],
-    plugins = ["@org_spire_math_kind_projector//jar"],
+    plugins = ["@org_typelevel_kind_projector//jar"],
     visibility = ["//visibility:public"],
 )