Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scala-compiler, scala-library, ... to 2.12.14 #520

Merged
merged 3 commits into from
Jun 23, 2021
Merged

Update scala-compiler, scala-library, ... to 2.12.14 #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdbe230
Update scala-compiler, scala-library, ... to 2.12.14
scala-steward Jun 23, 2021
aa99ab5
Change scala version in CI
tgodzik Jun 23, 2021
49dc8cd
Bump scalajs version in scripted tests
tgodzik Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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@v11
- run: sbt '++2.12.13 docs/mdoc'
- run: sbt '++2.12.14 docs/mdoc'
test-windows:
name: "Windows"
runs-on: windows-latest
Expand All @@ -42,7 +42,7 @@ jobs:
- "'++2.11.12 test'"
# Test legacy Scala versions, where reporting API changed
- "'++2.12.12 test'"
- "'++2.12.13 test' scripted"
- "'++2.12.14 test' scripted"
- "'++2.13.6 test'"
- "'++3.0.0 test'"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mdoc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
fetch-depth: 0
- uses: olafurpg/setup-scala@v11
- uses: olafurpg/setup-gpg@v3
- run: sbt '++2.12.13 docs/docusaurusPublishGhpages'
- run: sbt '++2.12.14 docs/docusaurusPublishGhpages'
env:
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import scala.collection.mutable

def scala212 = "2.12.13"
def scala212 = "2.12.14"
def scala211 = "2.11.12"
def scala213 = "2.13.6"
def scala3 = List("3.0.0", "3.0.0-RC3", "3.0.0-RC2", "3.0.0-RC1")
Expand Down
4 changes: 2 additions & 2 deletions mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion.in(ThisBuild) := "2.12.13"
scalaVersion.in(ThisBuild) := "2.12.14"

enablePlugins(MdocPlugin)
mdocJS := Some(jsapp)
Expand Down Expand Up @@ -28,6 +28,6 @@ println("Hello Scala.js!")

lazy val jsapp = project
.settings(
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.0.0"
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.1.0"
)
.enablePlugins(ScalaJSPlugin)
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % sys.props("plugin.version"))
addSbtCoursier