diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee2cabc..d9bee45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,13 +35,14 @@ jobs: - 2.13.10 - 2.13.11 - 2.13.12 - - 3.0.2 - 3.1.3 - 3.2.2 - 3.3.0-RC6 - 3.3.0 - 3.3.1-RC1 - 3.3.1 + - 3.3.2-RC1 + - 3.4.0-RC1 java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -215,16 +216,6 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.2) - uses: actions/download-artifact@v3 - with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2 - - - name: Inflate target directories (3.0.2) - run: | - tar xf targets.tar - rm targets.tar - - name: Download target directories (3.1.3) uses: actions/download-artifact@v3 with: @@ -285,6 +276,26 @@ jobs: tar xf targets.tar rm targets.tar + - name: Download target directories (3.3.2-RC1) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.2-RC1 + + - name: Inflate target directories (3.3.2-RC1) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (3.4.0-RC1) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.0-RC1 + + - name: Inflate target directories (3.4.0-RC1) + run: | + tar xf targets.tar + rm targets.tar + - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' run: echo $PGP_SECRET | base64 -di | gpg --import diff --git a/.mergify.yml b/.mergify.yml index d8682b7..7cc6ade 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -9,13 +9,14 @@ pull_request_rules: - status-success="Build and Test (ubuntu-latest, 2.13.10, temurin@8)" - status-success="Build and Test (ubuntu-latest, 2.13.11, temurin@8)" - status-success="Build and Test (ubuntu-latest, 2.13.12, temurin@8)" - - status-success="Build and Test (ubuntu-latest, 3.0.2, temurin@8)" - status-success="Build and Test (ubuntu-latest, 3.1.3, temurin@8)" - status-success="Build and Test (ubuntu-latest, 3.2.2, temurin@8)" - status-success="Build and Test (ubuntu-latest, 3.3.0-RC6, temurin@8)" - status-success="Build and Test (ubuntu-latest, 3.3.0, temurin@8)" - status-success="Build and Test (ubuntu-latest, 3.3.1-RC1, temurin@8)" - status-success="Build and Test (ubuntu-latest, 3.3.1, temurin@8)" + - status-success="Build and Test (ubuntu-latest, 3.3.2-RC1, temurin@8)" + - status-success="Build and Test (ubuntu-latest, 3.4.0-RC1, temurin@8)" actions: merge: method: merge diff --git a/README.md b/README.md index d060a3a..76058b0 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,10 @@ The plugin is currently published for the following Scala versions: - 2.12.15, 2.12.17, 2.12.18 - 2.13.10, 2.13.11, 2.13.12 -- 3.0.2 - 3.1.3 - 3.2.2 -- 3.3.0-RC6, 3.3.0, 3.3.1-RC1, 3.3.1 +- 3.3.0-RC6, 3.3.0, 3.3.1-RC1, 3.3.1, 3.3.2-RC1 +- 3.4.0-RC1 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/com/kubukoz)). diff --git a/project/ReadmePlugin.scala b/project/ReadmePlugin.scala index d174d64..dfeccbb 100644 --- a/project/ReadmePlugin.scala +++ b/project/ReadmePlugin.scala @@ -16,7 +16,7 @@ object ReadmePlugin extends AutoPlugin { def pattern(inside: String) = s"""$inside""" - val groups = List("2.12", "2.13", "3.0", "3.1", "3.2", "3.3") + val groups = List("2.12", "2.13", "3.1", "3.2", "3.3", "3.4") 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 index 8bdb61a..5750015 100644 --- a/scala-versions +++ b/scala-versions @@ -4,10 +4,11 @@ 2.13.10 2.13.11 2.13.12 -3.0.2 3.1.3 3.2.2 3.3.0-RC6 3.3.0 3.3.1-RC1 3.3.1 +3.3.2-RC1 +3.4.0-RC1