Skip to content

Commit

Permalink
Merge pull request #658 from scalameta/update/scala-compiler-2.12.16
Browse files Browse the repository at this point in the history
Update scala-compiler, scala-library, ... to 2.12.16
  • Loading branch information
tgodzik authored Jun 21, 2022
2 parents be432db + f966d7b commit 1eb563f
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
fetch-depth: 0
- uses: olafurpg/setup-scala@v13
- run: sbt '++2.12.15 docs/mdoc'
- run: sbt '++2.12.16 docs/mdoc'
test-windows:
name: "Windows"
runs-on: windows-latest
Expand All @@ -41,7 +41,7 @@ jobs:
command:
# Test legacy Scala versions, where reporting API changed
- "'++2.12.12 test'"
- "'++2.12.15 test'"
- "'++2.12.16 test'"
- "'++2.13.8 test'"
- "'++3.1.2 test'"
- "scripted"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fetch-depth: 0
- uses: olafurpg/setup-scala@v13
- uses: olafurpg/setup-gpg@v3
- run: sbt '++2.12.15 docs/docusaurusPublishGhpages'
- run: sbt '++2.12.16 docs/docusaurusPublishGhpages'
env:
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
- name: Check git diff
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import scala.collection.mutable

def scala212 = "2.12.15"
def scala212 = "2.12.16"
def scala213 = "2.13.8"
def scala3 = "3.1.2"
def scala2Versions = List(scala212, scala213)
Expand Down
4 changes: 2 additions & 2 deletions mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / scalaVersion := "2.12.15"
ThisBuild / crossScalaVersions := List("2.12.15", "2.13.8", "3.0.1")
ThisBuild / scalaVersion := "2.12.16"
ThisBuild / crossScalaVersions := List("2.12.16", "2.13.8", "3.0.1")

enablePlugins(MdocPlugin)
mdocJS := Some(jsapp)
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
> ++2.12.15 mdoc
> ++2.12.16 mdoc
> check
> ++2.13.8 mdoc
> check
Expand Down
4 changes: 2 additions & 2 deletions mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / scalaVersion := "2.12.15"
ThisBuild / crossScalaVersions := List("2.12.15", "2.13.8", "3.0.1")
ThisBuild / scalaVersion := "2.12.16"
ThisBuild / crossScalaVersions := List("2.12.16", "2.13.8", "3.0.1")

enablePlugins(MdocPlugin)
mdocJS := Some(jsapp)
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
> ++2.12.15 mdoc
> ++2.12.16 mdoc
> check
> ++2.13.8 mdoc
> check
Expand Down

0 comments on commit 1eb563f

Please sign in to comment.