Merge pull request #24 from kubukoz/cross-build-scala-3-rc2

.github/workflows/ci.yml

@@ -39,6 +39,7 @@ jobs:
           - 2.13.5
           - 3.0.0-M3
           - 3.0.0-RC1
+          - 3.0.0-RC2
         java: [[email protected]]
     runs-on: ${{ matrix.os }}
     steps:
@@ -222,6 +223,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3.0.0-RC2)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
+
+      - name: Inflate target directories (3.0.0-RC2)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - uses: olafurpg/setup-gpg@v3
 
       - run: sbt ++${{ matrix.scala }} ci-release

README.md

@@ -35,7 +35,7 @@ The plugin is currently published for the following Scala versions:
 
 - 2.12.10, 2.12.11, 2.12.12, 2.12.13
 - 2.13.1, 2.13.2, 2.13.3, 2.13.4, 2.13.5
-- 3.0.0-M3, 3.0.0-RC1
+- 3.0.0-M3, 3.0.0-RC1, 3.0.0-RC2
 
 ## What does the plugin actually do?
 

build.sbt

@@ -11,6 +11,12 @@ inThisBuild(
         "Jakub Kozłowski",
         "[email protected]",
         url("https://kubukoz.com")
+      ),
+      Developer(
+        "majk-p",
+        "Michał Pawlik",
+        "[email protected]",
+        url("https://michalp.net")
       )
     )
   )
@@ -32,7 +38,8 @@ ThisBuild / crossScalaVersions := Seq(
   "2.13.5",
   //
   "3.0.0-M3",
-  "3.0.0-RC1"
+  "3.0.0-RC1",
+  "3.0.0-RC2"
 )
 
 ThisBuild / githubWorkflowJavaVersions := Seq(GraalVM11)
@@ -60,10 +67,12 @@ val commonSettings = Seq(
   scalacOptions -= "-Xfatal-warnings"
 )
 
-def scalatestVersion(scalaVersion: String) = scalaVersion match {
-  case "3.0.0-M3" => "3.2.3"
-  case _          => "3.2.5"
-}
+def scalatestVersion(scalaVersion: String) =
+  scalaVersion match {
+    case "3.0.0-M3"  => "3.2.3"
+    case "3.0.0-RC1" => "3.2.5"
+    case _           => "3.2.7"
+  }
 
 val plugin = project.settings(
   name := "better-tostring",
@@ -72,7 +81,7 @@ val plugin = project.settings(
   crossVersion := CrossVersion.full,
   libraryDependencies ++= Seq(
     scalaOrganization.value % (
-      if (isDotty.value)
+      if (scalaVersion.value.startsWith("3"))
         s"scala3-compiler_${scalaVersion.value}"
       else "scala-compiler"
     ) % scalaVersion.value