diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf60b405d..f95b47d02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: - "'++2.12.19 test'" - "'++2.13.15 test'" # Minimal supported version - - "'++3.3.3 test'" + - "'++3.3.4 test'" - "scripted" steps: - uses: actions/checkout@v4 diff --git a/.mergify.yml b/.mergify.yml index d4b54001c..b404de064 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,12 +8,12 @@ pull_request_rules: - 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="'++3.3.3 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="'++3.3.3 test' 17" + - check-success="'++3.3.4 test' 17" - check-success=scripted 17 actions: merge: diff --git a/build.sbt b/build.sbt index 61e1b8f20..317d6862e 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ addCommandAlias( def scala212 = "2.12.20" def scala213 = "2.13.15" -def scala3 = "3.3.3" +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 d774aa80e..ff3f96d85 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.3") +ThisBuild / crossScalaVersions := List("2.12.20", "2.13.15", "3.3.4") enablePlugins(MdocPlugin) mdocJS := Some(jsapp) diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test index aca3cd6f3..dd50701a6 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test @@ -2,7 +2,7 @@ > check > ++2.13.15 mdoc > check -> ++3.3.3 mdoc +> ++3.3.4 mdoc > check > set mdocIn := (ThisBuild / baseDirectory).value -> mdoc diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt index caf6bc414..8337909ec 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt @@ -1,5 +1,5 @@ ThisBuild / scalaVersion := "2.12.18" -ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.3.3") +ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.3.4") enablePlugins(MdocPlugin) mdocJS := Some(jsapp) diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test b/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test index 5ecd789e1..41b8ef491 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test @@ -2,7 +2,7 @@ > check > ++2.13.12 mdoc > check -> ++3.3.3 mdoc +> ++3.3.4 mdoc > check > set mdocIn := (ThisBuild / baseDirectory).value -> mdoc diff --git a/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala b/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala index 8ac8e51cd..a2be33111 100644 --- a/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala +++ b/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala @@ -104,7 +104,7 @@ class ErrorSuite extends BaseMarkdownSuite { |``` """.stripMargin, """|error: not-member-scala3.md:3:1: - |value len is not a member of List[Int] - did you mean List[Int].min? + |value len is not a member of List[Int] |List(1).len |^^^^^^^^^^^ """.stripMargin