From c8023d5e387a3270ea7191e8128377b3a9473527 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Tue, 21 May 2024 14:28:38 +0200 Subject: [PATCH] chore: Bump all Scala versions --- .github/workflows/ci.yml | 6 +++--- .github/workflows/mdoc.yml | 2 +- .mergify.yml | 4 ++-- mdoc-sbt/src/main/scala/mdoc/BuildInfo.scala | 2 +- mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt | 2 +- .../src/sbt-test/sbt-mdoc/basic/project/plugins.sbt | 2 +- mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test | 2 +- .../sbt-mdoc/extra-arguments/project/plugins.sbt | 2 +- project/plugins.sbt | 2 +- .../src/test/scala/tests/imports/DependencySuite.scala | 10 +++++----- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 484ac29fa..cdcc5760e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 }} @@ -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" diff --git a/.github/workflows/mdoc.yml b/.github/workflows/mdoc.yml index b85c05d51..dd920d698 100644 --- a/.github/workflows/mdoc.yml +++ b/.github/workflows/mdoc.yml @@ -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 diff --git a/.mergify.yml b/.mergify.yml index e4770a1b2..c858e8bda 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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: diff --git a/mdoc-sbt/src/main/scala/mdoc/BuildInfo.scala b/mdoc-sbt/src/main/scala/mdoc/BuildInfo.scala index d5afed8f2..7ea91bee1 100644 --- a/mdoc-sbt/src/main/scala/mdoc/BuildInfo.scala +++ b/mdoc-sbt/src/main/scala/mdoc/BuildInfo.scala @@ -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() diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt index 0641bcc5c..0d55707de 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt @@ -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) diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt index daddabf5d..c069f36d7 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt @@ -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")) diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test index 0f189f3c2..95c6ade1a 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test @@ -1,6 +1,6 @@ > ++2.12.19 mdoc > check -> ++2.13.13 mdoc +> ++2.13.14 mdoc > check > ++3.3.3 mdoc > check diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/project/plugins.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/project/plugins.sbt index daddabf5d..c069f36d7 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/project/plugins.sbt +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/project/plugins.sbt @@ -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")) diff --git a/project/plugins.sbt b/project/plugins.sbt index 643d2ccbf..ea7c34e50 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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( diff --git a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala index 68b224299..7c9775438 100644 --- a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala +++ b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala @@ -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 - | - | 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 | | 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 + | + | 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 )