Add Scala 3.2.0 (#107)

* Add Scala 3.2.0 * (hopefully) fix tests and simplify unmanaged source folders
polyvariant · Sep 6, 2022 · 2ab98e6 · 2ab98e6
1 parent 383b8ee
commit 2ab98e6
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,6 +42,7 @@ jobs:
           - 3.1.1
           - 3.1.2
           - 3.1.3
+          - 3.2.0
         java: [graalvm-ce-java11@20.3.0]
     runs-on: ${{ matrix.os }}
     steps:
@@ -255,6 +256,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3.2.0)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-3.2.0-${{ matrix.java }}
+
+      - name: Inflate target directories (3.2.0)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - uses: olafurpg/setup-gpg@v3
 
       - run: sbt ++${{ matrix.scala }} ci-release
diff --git a/.mergify.yml b/.mergify.yml
@@ -17,6 +17,7 @@ pull_request_rules:
   - status-success="Build and Test (ubuntu-latest, 3.1.1, graalvm-ce-java11@20.3.0)"
   - status-success="Build and Test (ubuntu-latest, 3.1.2, graalvm-ce-java11@20.3.0)"
   - status-success="Build and Test (ubuntu-latest, 3.1.3, graalvm-ce-java11@20.3.0)"
+  - status-success="Build and Test (ubuntu-latest, 3.2.0, graalvm-ce-java11@20.3.0)"
   actions:
     merge:
       method: merge
diff --git a/README.md b/README.md
@@ -39,6 +39,7 @@ The plugin is currently published for the following Scala versions:
 - 2.13.5, 2.13.6, 2.13.7, 2.13.8
 - 3.0.0, 3.0.1, 3.0.2
 - 3.1.0, 3.1.1, 3.1.2, 3.1.3
+- 3.2.0
 <!-- SCALA VERSIONS END -->
 
 For older Scala versions, see [previous versions of better-tostring](https://repo1.maven.org/maven2/org/polyvariant) ([or even older versions](https://repo1.maven.org/maven2/org/polyvariant)).

diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 ThisBuild / resolvers += Resolver.JCenterRepository
 
 ThisBuild / scalaVersion := "3.0.0"
-ThisBuild / crossScalaVersions := IO.read(file("scala-versions")).split("\n")
+ThisBuild / crossScalaVersions := IO.read(file("scala-versions")).split("\n").map(_.trim)
 
 ThisBuild / githubWorkflowJavaVersions := Seq(GraalVM11)
 
@@ -89,7 +89,8 @@ val plugin = project.settings(
   Compile / unmanagedSourceDirectories ++= {
     val extraDirectoriesWithPredicates = Map[String, String => Boolean](
       ("scala-3.0.x", (_.startsWith("3.0"))),
-      ("scala-3.1.0+", (v => v.startsWith("3") && !v.startsWith("3.0")))
+      ("scala-3.1.x", (_.startsWith("3.1"))),
+      ("scala-3.2.x", (_.startsWith("3.2")))
     )
 
     extraDirectoriesWithPredicates.collect {

diff --git a/...in/src/main/scala-3.1.0+/AfterPhase.scala → plugin/src/main/scala-3.1.x/AfterPhase.scala b/...in/src/main/scala-3.1.0+/AfterPhase.scala → plugin/src/main/scala-3.1.x/AfterPhase.scala
diff --git a/plugin/src/main/scala-3.2.x/AfterPhase.scala b/plugin/src/main/scala-3.2.x/AfterPhase.scala
@@ -0,0 +1,3 @@
+package org.polyvariant
+
+val AfterPhase = dotty.tools.dotc.typer.TyperPhase
diff --git a/project/ReadmePlugin.scala b/project/ReadmePlugin.scala
@@ -17,7 +17,7 @@ object ReadmePlugin extends AutoPlugin {
 
       def pattern(inside: String) = s"""<!-- SCALA VERSIONS START -->$inside<!-- SCALA VERSIONS END -->"""
 
-      val groups = List("2.12", "2.13", "3.0", "3.1")
+      val groups = List("2.12", "2.13", "3.0", "3.1", "3.2")
 
       val versionsGrouped = crossScalaVersions.value.groupBy { v =>
         groups.find(v.startsWith(_)).getOrElse(sys.error("Unknown group for version: " + v))

diff --git a/scala-versions b/scala-versions
@@ -12,3 +12,4 @@
 3.1.1
 3.1.2
 3.1.3
+3.2.0