Skip to content

Commit

Permalink
chore: Bump all Scala versions
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed May 28, 2024
1 parent e52070a commit c8023d5
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
java-version: 11
distribution: adopt
- run: sbt '++2.12.18 docs/mdoc'
- run: sbt '++2.12.19 docs/mdoc'
test-windows:
name: "Windows"
runs-on: windows-latest
Expand All @@ -42,7 +42,7 @@ jobs:
with:
java-version: 11
distribution: adopt
- run: sbt '++2.13.13 test'
- run: sbt '++2.13.14 test'
shell: bash
test:
name: ${{ matrix.command }} ${{ matrix.java }}
Expand All @@ -55,7 +55,7 @@ jobs:
# Test legacy Scala versions, where reporting API changed
- "'++2.12.12! test'"
- "'++2.12.19 test'"
- "'++2.13.13 test'"
- "'++2.13.14 test'"
# Minimal supported version
- "'++3.3.3 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 @@ -18,7 +18,7 @@ jobs:
java-version: 11
distribution: adopt
- uses: olafurpg/setup-gpg@v3
- run: sbt '++2.12.18 docs/docusaurusPublishGhpages'
- run: sbt '++2.12.19 docs/docusaurusPublishGhpages'
env:
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
- name: Check git diff
Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ pull_request_rules:
- check-success=Windows
- check-success="'++2.12.12! test' adopt@1.11"
- check-success="'++2.12.19 test' adopt@1.11"
- check-success="'++2.13.13 test' adopt@1.11"
- check-success="'++2.13.14 test' adopt@1.11"
- check-success="'++3.3.3 test' adopt@1.11"
- check-success="scripted adopt@1.11"
- check-success="'++2.12.12! test' 17"
- check-success="'++2.12.19 test' 17"
- check-success="'++2.13.13 test' 17"
- check-success="'++2.13.14 test' 17"
- check-success="'++3.3.3 test' 17"
- check-success=scripted 17
actions:
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/main/scala/mdoc/BuildInfo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ object BuildInfo {
props.getProperty("version", "0.8.0-SNAPSHOT")

def scalaJSVersion: String =
props.getProperty("scalaJSVersion", "1.13.0")
props.getProperty("scalaJSVersion", "1.16.0")

private lazy val props: Properties = {
val props = new Properties()
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.18"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / crossScalaVersions := List("2.12.19", "2.13.14", "3.3.3")

enablePlugins(MdocPlugin)
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % sys.props("plugin.version"))
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,6 +1,6 @@
> ++2.12.19 mdoc
> check
> ++2.13.13 mdoc
> ++2.13.14 mdoc
> check
> ++3.3.3 mdoc
> check
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % sys.props("plugin.version"))
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")

libraryDependencies ++= List(
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/src/test/scala/tests/imports/DependencySuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ class DependencySuite extends BaseMarkdownSuite {
| not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
|<redacted user.home>
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
|import $$dep.`org.scalameta:::not-exists:2.3.4`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_2.13:2.3.4
|<redacted user.home>
| not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_2.13/2.3.4/mmunit_2.13-2.3.4.pom
|import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_${BuildInfo.scalaVersion}:2.3.4
|<redacted user.home>
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
|import $$dep.`org.scalameta:::not-exists:2.3.4`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|""".stripMargin
)

Expand Down

0 comments on commit c8023d5

Please sign in to comment.