Skip to content

Commit

Permalink
Remove 3.0, add 3.2.0-RC1, 3.3.2-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
kubukoz committed Dec 22, 2023
1 parent af0f212 commit 90ae0ad
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 16 deletions.
33 changes: 22 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ The plugin is currently published for the following Scala versions:
<!-- SCALA VERSIONS START -->
- 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
<!-- 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/com/kubukoz)).
Expand Down
2 changes: 1 addition & 1 deletion project/ReadmePlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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", "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))
Expand Down
3 changes: 2 additions & 1 deletion scala-versions
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 90ae0ad

Please sign in to comment.