scala: upgrade 2.13 to .17, 3.3 to .7

kitbellew · kitbellew · commit f723613118eb · 2025-10-12T15:13:36.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
           distribution: temurin
           cache: sbt
       - uses: sbt/setup-sbt@v1
-      - run: sbt '++2.12.19; docs/mdoc'
+      - run: sbt '++2.12.20; docs/mdoc'
   test-windows:
     name: "Windows"
     runs-on: windows-latest
@@ -83,7 +83,7 @@ jobs:
           distribution: temurin
           cache: sbt
       - uses: sbt/setup-sbt@v1
-      - run: sbt '++2.13.16 test'
+      - run: sbt '++2.13.17 test'
         shell: bash
   test:
     name: ${{ matrix.command }} ${{ matrix.java }}
@@ -95,10 +95,10 @@ jobs:
         command:
           # 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.16 test'"
+          - "'++2.12.20 test'"
+          - "'++2.13.17 test'"
           # Minimal supported version
-          - "'++3.3.6 test'"
+          - "'++3.3.7 test'"
           - "'++3.7.3 plugin/test'"
           - "'++2.12.20 scripted'"
           - "'++3.7.3 scripted'"
diff --git a/.github/workflows/mdoc.yml b/.github/workflows/mdoc.yml
@@ -19,7 +19,7 @@ jobs:
           distribution: temurin
       - uses: sbt/setup-sbt@v1
       - uses: olafurpg/setup-gpg@v3
-      - run: sbt '++2.12.19; docs/docusaurusPublishGhpages'
+      - run: sbt '++2.12.20; docs/docusaurusPublishGhpages'
         env:
           GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
       - name: Check git diff
diff --git a/.mergify.yml b/.mergify.yml
@@ -6,14 +6,14 @@ pull_request_rules:
       - check-success=Website
       - check-success=Windows
       - check-success="'++2.12.12! testAllNonNative' 11"
-      - check-success="'++2.12.19 test' 11"
-      - check-success="'++2.13.16 test' 11"
-      - check-success="'++3.3.6 test' 11"
+      - check-success="'++2.12.20 test' 11"
+      - check-success="'++2.13.17 test' 11"
+      - check-success="'++3.3.7 test' 11"
       - check-success="scripted 11"
       - check-success="'++2.12.12! testAllNonNative' 17"
-      - check-success="'++2.12.19 test' 17"
-      - check-success="'++2.13.16 test' 17"
-      - check-success="'++3.3.6 test' 17"
+      - check-success="'++2.12.20 test' 17"
+      - check-success="'++2.13.17 test' 17"
+      - check-success="'++3.3.7 test' 17"
       - check-success="scripted 17"
     actions:
       merge:
diff --git a/build.sbt b/build.sbt
@@ -8,8 +8,8 @@ addCommandAlias(
 )
 
 def scala212 = "2.12.20"
-def scala213 = "2.13.16"
-def scala3 = "3.3.6"
+def scala213 = "2.13.17"
+def scala3 = "3.3.7"
 def scala3ForSbt = "3.7.3"
 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
@@ -1,5 +1,5 @@
 ThisBuild / scalaVersion := "2.12.20"
-ThisBuild / crossScalaVersions := List("2.12.20", "2.13.16", "3.3.6")
+ThisBuild / crossScalaVersions := List("2.12.20", "2.13.17", "3.3.7")
 
 enablePlugins(MdocPlugin)
 mdocJS := Some(jsapp)
diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/compiler-plugin/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/compiler-plugin/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "3.3.6"
+scalaVersion := "3.3.7"
 lazy val acyclic = ("com.lihaoyi" %% "acyclic" % "0.3.19").cross(CrossVersion.full)
 addCompilerPlugin(acyclic)
 libraryDependencies += acyclic % "provided"
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
@@ -1,3 +1,3 @@
-ThisBuild / scalaVersion := "2.13.16"
+ThisBuild / scalaVersion := "2.13.17"
 
 enablePlugins(MdocPlugin)
diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/scalac-options-dedup/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/scalac-options-dedup/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "3.3.6"
+ThisBuild / scalaVersion := "3.3.7"
 
 enablePlugins(MdocPlugin)
 
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
@@ -1,5 +1,5 @@
-ThisBuild / scalaVersion := "2.12.18"
-ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12", "3.3.6")
+ThisBuild / scalaVersion := "2.12.20"
+ThisBuild / crossScalaVersions := List("2.12.20", "2.13.17", "3.3.7")
 
 enablePlugins(MdocPlugin)
 mdocJS := Some(jsapp)
diff --git a/mdoc/src/main/scala/mdoc/internal/modifiers/ScastieModifier.scala b/mdoc/src/main/scala/mdoc/internal/modifiers/ScastieModifier.scala
@@ -68,7 +68,7 @@ class ScastieModifier(theme: String = "light", debugClassSuffix: Option[String]
       s"   theme: '$theme',",
       "    isWorksheetMode: true,",
       "    targetType: 'jvm',",
-      "    scalaVersion: '2.12.6'",
+      "    scalaVersion: '2.12.20'",
       "  })"
     ).mkString("\n")
 
diff --git a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala
@@ -152,9 +152,9 @@ 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:3:13: Error downloading org.scalameta:mmunit_2.13:2.3.4
+        |error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_${BuildInfo.scalaBinaryVersion}: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
+        |  not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_${BuildInfo.scalaBinaryVersion}/2.3.4/mmunit_${BuildInfo.scalaBinaryVersion}-2.3.4.pom
         |import $$dep.`org.scalameta::mmunit:2.3.4`, $$dep.`org.scalameta:foobar:1.2.1`
         |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         |""".stripMargin
@@ -170,19 +170,19 @@ class DependencySuite extends BaseMarkdownSuite {
       |println(42)
       |```
       | """.stripMargin,
-    s"""|error: dep-error-using.md:4:11: Error downloading org.scalameta:not-exists_2.13.16:2.3.4
+    s"""|error: dep-error-using.md:4:11: 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_2.13.16/2.3.4/not-exists_2.13.16-2.3.4.pom
+        |  not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_${BuildInfo.scalaVersion}/2.3.4/not-exists_${BuildInfo.scalaVersion}-2.3.4.pom
         |//> using dep org.scalameta:::not-exists:2.3.4
         |          ^
         |error: dep-error-using.md:3:11: Error downloading org.scalameta:foobar:1.2.1
         |<redacted user.home>
         |  not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
         |//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
         |          ^
-        |error: dep-error-using.md:3:11: Error downloading org.scalameta:mmunit_2.13:2.3.4
+        |error: dep-error-using.md:3:11: Error downloading org.scalameta:mmunit_${BuildInfo.scalaBinaryVersion}: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
+        |  not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_${BuildInfo.scalaBinaryVersion}/2.3.4/mmunit_${BuildInfo.scalaBinaryVersion}-2.3.4.pom
         |//> using dep org.scalameta::mmunit:2.3.4 org.scalameta:foobar:1.2.1
         |          ^
         |""".stripMargin
diff --git a/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala b/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala
@@ -133,7 +133,7 @@ class ErrorSuite extends BaseMarkdownSuite {
       |```
     """.stripMargin,
     """|error: already-defined-scala3.md:4:5:
-       |Double definition:
+       |Conflicting definitions
        |val x: Int in class MdocApp at line 7 and
        |val x: Int in class MdocApp at line 11
        |
diff --git a/tests/unit/src/test/scala/tests/markdown/ScastieModifierSuite.scala b/tests/unit/src/test/scala/tests/markdown/ScastieModifierSuite.scala
@@ -45,7 +45,7 @@ class ScastieModifierSuite extends BaseMarkdownSuite {
        |   theme: 'light',
        |    isWorksheetMode: true,
        |    targetType: 'jvm',
-       |    scalaVersion: '2.12.6'
+       |    scalaVersion: '2.12.20'
        |  })
        |})</script>
     """.stripMargin
@@ -67,7 +67,7 @@ class ScastieModifierSuite extends BaseMarkdownSuite {
        |   theme: 'dark',
        |    isWorksheetMode: true,
        |    targetType: 'jvm',
-       |    scalaVersion: '2.12.6'
+       |    scalaVersion: '2.12.20'
        |  })
        |})</script>
     """.stripMargin,
diff --git a/website.md b/website.md
@@ -9,6 +9,6 @@ Next
 
 1. Switch to the "website" folder. run `npm install`
 2. Copy the blog folder into the `website` folder (don't commit that)
-3. Back in the project root, run `sbt '++2.12.19; docs/mdoc'` in a terminal - this will run mdoc.
+3. Back in the project root, run `sbt '++2.12.20; docs/mdoc'` in a terminal - this will run mdoc.
 4. probably in a new terminal in the "website" folder , run `npm start`
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-scalaVersion := "3.3.6"`
	`1`	`+scalaVersion := "3.3.7"`
`2`	`2`	`lazy val acyclic = ("com.lihaoyi" %% "acyclic" % "0.3.19").cross(CrossVersion.full)`
`3`	`3`	`addCompilerPlugin(acyclic)`
`4`	`4`	`libraryDependencies += acyclic % "provided"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-ThisBuild / scalaVersion := "2.13.16"`
	`1`	`+ThisBuild / scalaVersion := "2.13.17"`
`2`	`2`
`3`	`3`	`enablePlugins(MdocPlugin)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ThisBuild / scalaVersion := "3.3.6"`
	`1`	`+ThisBuild / scalaVersion := "3.3.7"`
`2`	`2`
`3`	`3`	`enablePlugins(MdocPlugin)`
`4`	`4`