From 1a93e3897365021360847c2ed13c30353123d168 Mon Sep 17 00:00:00 2001 From: Scalameta Bot Date: Mon, 27 Jan 2025 01:05:38 +0000 Subject: [PATCH 1/2] Update scala-compiler, scala-library, ... to 2.13.16 --- build.sbt | 2 +- mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt | 2 +- mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index e5926f52..9d8a7253 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ addCommandAlias( ) def scala212 = "2.12.20" -def scala213 = "2.13.15" +def scala213 = "2.13.16" def scala3 = "3.3.4" def scala2Versions = List(scala212, scala213) def allScalaVersions = scala2Versions :+ scala3 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 ff3f96d8..9686e14e 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt @@ -1,5 +1,5 @@ ThisBuild / scalaVersion := "2.12.20" -ThisBuild / crossScalaVersions := List("2.12.20", "2.13.15", "3.3.4") +ThisBuild / crossScalaVersions := List("2.12.20", "2.13.16", "3.3.4") enablePlugins(MdocPlugin) mdocJS := Some(jsapp) diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt index 0685bf19..e59fc61d 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt @@ -1,3 +1,3 @@ -ThisBuild / scalaVersion := "2.13.15" +ThisBuild / scalaVersion := "2.13.16" enablePlugins(MdocPlugin) From be76066b20ee5a73ef67c13838ccadb5afbfd461 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Tue, 28 Jan 2025 11:54:31 +0100 Subject: [PATCH 2/2] chore: Update everything to 2.13.16 --- .github/workflows/ci.yml | 4 ++-- .mergify.yml | 4 ++-- mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test | 2 +- .../test/scala/tests/imports/DependencySuite.scala | 12 ++++++------ .../src/test/scala/tests/imports/ScalacSuite.scala | 11 ++++++++++- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c3d9a86..5a3f0e3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: distribution: temurin cache: sbt - uses: sbt/setup-sbt@v1 - - run: sbt '++2.13.15 test' + - run: sbt '++2.13.16 test' shell: bash test: name: ${{ matrix.command }} ${{ matrix.java }} @@ -59,7 +59,7 @@ jobs: # Test legacy Scala versions, where reporting API changed - "'++2.12.12! testAllNonNative'" # compiler version too old for Scala Native - "'++2.12.19 test'" - - "'++2.13.15 test'" + - "'++2.13.16 test'" # Minimal supported version - "'++3.3.4 test'" - "scripted" diff --git a/.mergify.yml b/.mergify.yml index b404de06..e55f6c2f 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.15 test' adopt@1.11" + - check-success="'++2.13.16 test' adopt@1.11" - check-success="'++3.3.4 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.15 test' 17" + - check-success="'++2.13.16 test' 17" - check-success="'++3.3.4 test' 17" - check-success=scripted 17 actions: diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test index dd50701a..44847852 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.15 mdoc +> ++2.13.16 mdoc > check > ++3.3.4 mdoc > check diff --git a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala index 7c977543..f091f593 100644 --- a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala +++ b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala @@ -82,7 +82,12 @@ class DependencySuite extends BaseMarkdownSuite { |println(42) |``` | """.stripMargin, - s"""|error: dep-error.md:3:49: Error downloading org.scalameta:foobar:1.2.1 + s"""|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:49: Error downloading org.scalameta:foobar:1.2.1 | | 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` @@ -92,11 +97,6 @@ class DependencySuite extends BaseMarkdownSuite { | 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 ) diff --git a/tests/unit/src/test/scala/tests/imports/ScalacSuite.scala b/tests/unit/src/test/scala/tests/imports/ScalacSuite.scala index f320bd88..c480afc5 100644 --- a/tests/unit/src/test/scala/tests/imports/ScalacSuite.scala +++ b/tests/unit/src/test/scala/tests/imports/ScalacSuite.scala @@ -1,6 +1,7 @@ package tests.imports import tests.markdown.BaseMarkdownSuite +import tests.markdown.Compat class ScalacSuite extends BaseMarkdownSuite { @@ -17,7 +18,15 @@ class ScalacSuite extends BaseMarkdownSuite { |warning: import.md:4:1: Unused import |import scala.util.Try |^^^^^^^^^^^^^^^^^^^^^ - |""".stripMargin + |""".stripMargin, + compat = Map( + Compat.Scala213 -> + """|error: No warnings can be incurred under -Werror. + |warning: import.md:4:19: Unused import + |import scala.util.Try + | ^^^ + |""".stripMargin + ) ) check(