Skip to content

Commit 74bbfd8

Browse files
authored
Add 3.1.1-RC1, RC2 (#95)
1 parent e2a3c05 commit 74bbfd8

File tree

6 files changed

+58
-22
lines changed

6 files changed

+58
-22
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ jobs:
4040
- 3.1.0-RC2
4141
- 3.1.0-RC3
4242
- 3.1.0
43+
- 3.1.1-RC1
44+
- 3.1.1-RC2
4345
java: [graalvm-ce-java11@20.3.0]
4446
runs-on: ${{ matrix.os }}
4547
steps:
@@ -233,6 +235,26 @@ jobs:
233235
tar xf targets.tar
234236
rm targets.tar
235237

238+
- name: Download target directories (3.1.1-RC1)
239+
uses: actions/download-artifact@v2
240+
with:
241+
name: target-${{ matrix.os }}-3.1.1-RC1-${{ matrix.java }}
242+
243+
- name: Inflate target directories (3.1.1-RC1)
244+
run: |
245+
tar xf targets.tar
246+
rm targets.tar
247+
248+
- name: Download target directories (3.1.1-RC2)
249+
uses: actions/download-artifact@v2
250+
with:
251+
name: target-${{ matrix.os }}-3.1.1-RC2-${{ matrix.java }}
252+
253+
- name: Inflate target directories (3.1.1-RC2)
254+
run: |
255+
tar xf targets.tar
256+
rm targets.tar
257+
236258
- uses: olafurpg/setup-gpg@v3
237259

238260
- run: sbt ++${{ matrix.scala }} ci-release

.mergify.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ pull_request_rules:
1515
- status-success="Build and Test (ubuntu-latest, 3.1.0-RC2, graalvm-ce-java11@20.3.0)"
1616
- status-success="Build and Test (ubuntu-latest, 3.1.0-RC3, graalvm-ce-java11@20.3.0)"
1717
- status-success="Build and Test (ubuntu-latest, 3.1.0, graalvm-ce-java11@20.3.0)"
18+
- status-success="Build and Test (ubuntu-latest, 3.1.1-RC1, graalvm-ce-java11@20.3.0)"
19+
- status-success="Build and Test (ubuntu-latest, 3.1.1-RC2, graalvm-ce-java11@20.3.0)"
1820
actions:
1921
merge:
2022
method: merge

README.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ The plugin is currently published for the following Scala versions:
3737
<!-- SCALA VERSIONS START -->
3838
- 2.12.13, 2.12.14, 2.12.15
3939
- 2.13.5, 2.13.6, 2.13.7
40-
- 3.0.0, 3.0.1, 3.0.2, 3.1.0-RC2, 3.1.0-RC3, 3.1.0
40+
- 3.0.0, 3.0.1, 3.0.2
41+
- 3.1.0-RC2, 3.1.0-RC3, 3.1.0, 3.1.1-RC1, 3.1.1-RC2
4142
<!-- SCALA VERSIONS END -->
4243

4344
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)).
@@ -69,6 +70,18 @@ We also want the plugin to become minimal in the implementation and easy to use
6970

7071
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).
7172

73+
## Contributing
74+
75+
If you want to add a new feature, check if it's already been discussed in the issues list.
76+
77+
Before you start working on an existing feature / bugfix, let us know you're taking it on in its comments :)
78+
79+
To add a new Scala version:
80+
81+
1. Add it to `./scala-versions`
82+
2. Run `sbt generateAll`
83+
3. Commit and open a pull request.s
84+
7285
## Maintainers
7386

7487
The maintainers of this project (people who can merge PRs and make releases) are:

build.sbt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
3131
ThisBuild / resolvers += Resolver.JCenterRepository
3232

3333
ThisBuild / scalaVersion := "3.0.0"
34-
ThisBuild / crossScalaVersions := Seq(
35-
"2.12.13",
36-
"2.12.14",
37-
"2.12.15",
38-
//
39-
"2.13.5",
40-
"2.13.6",
41-
"2.13.7",
42-
//
43-
"3.0.0",
44-
"3.0.1",
45-
"3.0.2",
46-
"3.1.0-RC2",
47-
"3.1.0-RC3",
48-
"3.1.0"
49-
)
34+
ThisBuild / crossScalaVersions := IO.read(file("scala-versions")).split("\n")
5035

5136
ThisBuild / githubWorkflowJavaVersions := Seq(GraalVM11)
5237

project/ReadmePlugin.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ object ReadmePlugin extends AutoPlugin {
1717

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

20-
val versionsGrouped = crossScalaVersions.value.groupBy {
21-
case s if s.startsWith("2.13") => "2.13"
22-
case s if s.startsWith("2.12") => "2.12"
23-
case s => "3"
20+
val groups = List("2.12", "2.13", "3.0", "3.1")
21+
22+
val versionsGrouped = crossScalaVersions.value.groupBy { v =>
23+
groups.find(v.startsWith(_)).getOrElse(sys.error("Unknown group for version: " + v))
2424
}
2525

26-
val versionsString = List("2.12", "2.13", "3")
26+
val versionsString = groups
2727
.map { prefix =>
2828
"- " + versionsGrouped(prefix).mkString(", ")
2929
}

scala-versions

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2.12.13
2+
2.12.14
3+
2.12.15
4+
2.13.5
5+
2.13.6
6+
2.13.7
7+
3.0.0
8+
3.0.1
9+
3.0.2
10+
3.1.0-RC2
11+
3.1.0-RC3
12+
3.1.0
13+
3.1.1-RC1
14+
3.1.1-RC2

0 commit comments

Comments
 (0)