Skip to content

Commit

Permalink
Add 3.1.1-RC1, RC2 (#95)
Browse files Browse the repository at this point in the history
  • Loading branch information
kubukoz authored Dec 24, 2021
1 parent e2a3c05 commit 74bbfd8
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 22 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
- 3.1.0-RC2
- 3.1.0-RC3
- 3.1.0
- 3.1.1-RC1
- 3.1.1-RC2
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -233,6 +235,26 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.1.1-RC1)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.1.1-RC1-${{ matrix.java }}

- name: Inflate target directories (3.1.1-RC1)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.1.1-RC2)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.1.1-RC2-${{ matrix.java }}

- name: Inflate target directories (3.1.1-RC2)
run: |
tar xf targets.tar
rm targets.tar
- uses: olafurpg/setup-gpg@v3

- run: sbt ++${{ matrix.scala }} ci-release
2 changes: 2 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ pull_request_rules:
- status-success="Build and Test (ubuntu-latest, 3.1.0-RC2, [email protected])"
- status-success="Build and Test (ubuntu-latest, 3.1.0-RC3, [email protected])"
- status-success="Build and Test (ubuntu-latest, 3.1.0, [email protected])"
- status-success="Build and Test (ubuntu-latest, 3.1.1-RC1, [email protected])"
- status-success="Build and Test (ubuntu-latest, 3.1.1-RC2, [email protected])"
actions:
merge:
method: merge
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ The plugin is currently published for the following Scala versions:
<!-- SCALA VERSIONS START -->
- 2.12.13, 2.12.14, 2.12.15
- 2.13.5, 2.13.6, 2.13.7
- 3.0.0, 3.0.1, 3.0.2, 3.1.0-RC2, 3.1.0-RC3, 3.1.0
- 3.0.0, 3.0.1, 3.0.2
- 3.1.0-RC2, 3.1.0-RC3, 3.1.0, 3.1.1-RC1, 3.1.1-RC2
<!-- 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)).
Expand Down Expand Up @@ -69,6 +70,18 @@ We also want the plugin to become minimal in the implementation and easy to use

If you need a different `toString`, we suggest that you implement one yourself. You may also want to look at [pprint](https://github.com/com-lihaoyi/PPrint).

## Contributing

If you want to add a new feature, check if it's already been discussed in the issues list.

Before you start working on an existing feature / bugfix, let us know you're taking it on in its comments :)

To add a new Scala version:

1. Add it to `./scala-versions`
2. Run `sbt generateAll`
3. Commit and open a pull request.s

## Maintainers

The maintainers of this project (people who can merge PRs and make releases) are:
Expand Down
17 changes: 1 addition & 16 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
ThisBuild / resolvers += Resolver.JCenterRepository

ThisBuild / scalaVersion := "3.0.0"
ThisBuild / crossScalaVersions := Seq(
"2.12.13",
"2.12.14",
"2.12.15",
//
"2.13.5",
"2.13.6",
"2.13.7",
//
"3.0.0",
"3.0.1",
"3.0.2",
"3.1.0-RC2",
"3.1.0-RC3",
"3.1.0"
)
ThisBuild / crossScalaVersions := IO.read(file("scala-versions")).split("\n")

ThisBuild / githubWorkflowJavaVersions := Seq(GraalVM11)

Expand Down
10 changes: 5 additions & 5 deletions project/ReadmePlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ object ReadmePlugin extends AutoPlugin {

def pattern(inside: String) = s"""<!-- SCALA VERSIONS START -->$inside<!-- SCALA VERSIONS END -->"""

val versionsGrouped = crossScalaVersions.value.groupBy {
case s if s.startsWith("2.13") => "2.13"
case s if s.startsWith("2.12") => "2.12"
case s => "3"
val groups = List("2.12", "2.13", "3.0", "3.1")

val versionsGrouped = crossScalaVersions.value.groupBy { v =>
groups.find(v.startsWith(_)).getOrElse(sys.error("Unknown group for version: " + v))
}

val versionsString = List("2.12", "2.13", "3")
val versionsString = groups
.map { prefix =>
"- " + versionsGrouped(prefix).mkString(", ")
}
Expand Down
14 changes: 14 additions & 0 deletions scala-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
2.12.13
2.12.14
2.12.15
2.13.5
2.13.6
2.13.7
3.0.0
3.0.1
3.0.2
3.1.0-RC2
3.1.0-RC3
3.1.0
3.1.1-RC1
3.1.1-RC2

0 comments on commit 74bbfd8

Please sign in to comment.