Skip to content

Commit

Permalink
Merge pull request #757 from scala-steward/update/scala-library-2.12.13
Browse files Browse the repository at this point in the history
Update scala-library to 2.12.13
  • Loading branch information
julienrf committed Apr 29, 2021
2 parents 4c64bbd + 1b83b5f commit 7718752
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
with:
java-version: adopt@1.11
- run: npm install jsdom@12.2.0
- run: sbt ++2.12.12 coverage test coverageReport coverageAggregate
- run: bash <(curl -s https://codecov.io/bash)
- run: sbt ++2.12.13 test

test213:
name: Test (Scala 2.13)
Expand All @@ -34,7 +33,8 @@ jobs:
java-version: adopt@1.11
- run: npm install jsdom@12.2.0
- run: sudo apt-get install graphviz
- run: sbt ++2.13.4 test manual/makeSite
- run: sbt ++2.13.4 coverage test coverageReport coverageAggregate manual/makeSite
- run: bash <(curl -s https://codecov.io/bash)

test3:
name: Test (Scala 3)
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $ sbt test
Or, for a specific Scala version:

~~~ sh
$ sbt "++ 2.12.11 test"
$ sbt "++ 2.12.13 test"
$ sbt "++ 2.13.2 test"
~~~

Expand Down Expand Up @@ -81,7 +81,7 @@ After generating intellij project you may need to navigate to Settings -> Langua
`1.0.1`, `1.1.0`, or `2.0.0`, according to the compatibility guarantees of the module)
2. Run the following command:
~~~ sh
$ sbt versionCheck "++ 2.12.12 publishSigned" "++ 2.13.3 publishSigned" sonatypeReleaseAll "++ 2.13.3 manual/makeSite" manual/ghpagesPushSite
$ sbt versionCheck "++ 2.12.13 publishSigned" "++ 2.13.3 publishSigned" sonatypeReleaseAll "++ 2.13.3 manual/makeSite" manual/ghpagesPushSite
~~~
3. Reset the compatibility intention to `Compatibility.BinaryAndSourceCompatible`,
and add a `+n` suffix to the version of every module (e.g., change `1.0.0`
Expand Down
4 changes: 2 additions & 2 deletions project/EndpointsSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ object EndpointsSettings {
)
val `scala 2.12 to 2.13` = Seq(
scalaVersion := "2.13.4",
crossScalaVersions := Seq("2.13.4", "2.12.12")
crossScalaVersions := Seq("2.13.4", "2.12.13")
)
val `scala 2.12 to dotty` = Seq(
scalaVersion := "2.13.4",
crossScalaVersions := Seq("2.13.4", "3.0.0-RC3", "2.12.12")
crossScalaVersions := Seq("2.13.4", "3.0.0-RC3", "2.12.13")
)

val publishSettings = commonSettings ++ Seq(
Expand Down

0 comments on commit 7718752

Please sign in to comment.