Merge branch 'main' into update/munit-1.0.0-M8

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           node-version: "16"
       - uses: olafurpg/setup-scala@v13
-      - run: sbt '++2.12.17 docs/mdoc'
+      - run: sbt '++2.12.18 docs/mdoc'
   test-windows:
     name: "Windows"
     runs-on: windows-latest
@@ -35,7 +35,7 @@ jobs:
       - uses: olafurpg/setup-scala@v13
         with:
           java-version: [email protected]
-      - run: sbt '++2.13.10 test'
+      - run: sbt '++2.13.11 test'
         shell: bash
   test:
     name: ${{ matrix.command }} ${{ matrix.java }}
@@ -47,8 +47,8 @@ jobs:
         command:
           # Test legacy Scala versions, where reporting API changed
           - "'++2.12.12! test'"
-          - "'++2.12.17 test'"
-          - "'++2.13.10 test'"
+          - "'++2.12.18 test'"
+          - "'++2.13.11 test'"
           # Minimal supported version
           - "'++3.1.3 test'"
           - "scripted"

.github/workflows/mdoc.yml

@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 0
       - uses: olafurpg/setup-scala@v13
       - uses: olafurpg/setup-gpg@v3
-      - run: sbt '++2.12.17 docs/docusaurusPublishGhpages'
+      - run: sbt '++2.12.18 docs/docusaurusPublishGhpages'
         env:
           GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
       - name: Check git diff

.mergify.yml

@@ -6,18 +6,18 @@ pull_request_rules:
       - check-success=Website
       - check-success=Windows
       - check-success="'++2.12.12! test' [email protected]"
-      - check-success="'++2.12.17 test' [email protected]"
-      - check-success="'++2.13.10 test' [email protected]"
+      - check-success="'++2.12.18 test' [email protected]"
+      - check-success="'++2.13.11 test' [email protected]"
       - check-success="'++3.1.3 test' [email protected]"
       - check-success="scripted [email protected]"
       - check-success="'++2.12.12! test' [email protected]"
-      - check-success="'++2.12.17 test' [email protected]"
-      - check-success="'++2.13.10 test' [email protected]"
+      - check-success="'++2.12.18 test' [email protected]"
+      - check-success="'++2.13.11 test' [email protected]"
       - check-success="'++3.1.3 test' [email protected]"
       - check-success="scripted [email protected]"
       - check-success="'++2.12.12! test' 17"
-      - check-success="'++2.12.17 test' 17"
-      - check-success="'++2.13.10 test' 17"
+      - check-success="'++2.12.18 test' 17"
+      - check-success="'++2.13.11 test' 17"
       - check-success="'++3.1.3 test' 17"
       - check-success=scripted 17
     actions:

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.7.3"
+version = "3.7.5"
 runner.dialect = scala213
 maxColumn = 100
 project.git = true

build.sbt

@@ -1,7 +1,7 @@
 import scala.collection.mutable
 
-def scala212 = "2.12.17"
-def scala213 = "2.13.10"
+def scala212 = "2.12.18"
+def scala213 = "2.13.11"
 /* This should be kept at 3.1.3 until there is a
  * need for change and in that case we should bump to LTS*/
 def scala3 = "3.1.3"
@@ -122,9 +122,9 @@ lazy val sharedJavaSettings = List(
 )
 
 val V = new {
-  val scalameta = "4.7.7"
+  val scalameta = "4.7.8"
   val munit = "1.0.0-M7"
-  val coursier = "1.0.16"
+  val coursier = "1.0.18"
   val scalacheck = "1.17.0"
   val pprint = "0.8.1"
   val fansi = "0.4.0"
@@ -321,7 +321,7 @@ lazy val unit = project
     },
     scala212LibraryDependencies(
       List(
-        "io.github.cibotech" %% "evilplot" % "0.8.1"
+        "io.github.cibotech" %% "evilplot" % "0.9.0"
       )
     ),
     libraryDependencies ++= List(
@@ -452,7 +452,7 @@ lazy val docs = project
     mdocAutoDependency := false,
     libraryDependencies ++= List(
       "org.scala-sbt" % "sbt" % sbtVersion.value,
-      "io.github.cibotech" %% "evilplot" % "0.8.1"
+      "io.github.cibotech" %% "evilplot" % "0.9.0"
     ),
     watchSources += (ThisBuild / baseDirectory).value / "docs",
     Global / cancelable := true,

mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt

@@ -1,5 +1,5 @@
-ThisBuild / scalaVersion := "2.12.17"
-ThisBuild / crossScalaVersions := List("2.12.17", "2.13.10", "3.1.3", "3.2.2")
+ThisBuild / scalaVersion := "2.12.18"
+ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11", "3.1.3", "3.2.2")
 
 enablePlugins(MdocPlugin)
 mdocJS := Some(jsapp)

mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/build.properties

@@ -1 +1 @@
-sbt.version = 1.8.3
+sbt.version = 1.9.1

mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test

@@ -1,6 +1,6 @@
-> ++2.12.17 mdoc
+> ++2.12.18 mdoc
 > check
-> ++2.13.10 mdoc
+> ++2.13.11 mdoc
 > check
 > ++3.1.3 mdoc
 > check

mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt

@@ -1,3 +1,3 @@
-ThisBuild / scalaVersion := "2.13.10"
+ThisBuild / scalaVersion := "2.13.11"
 
 enablePlugins(MdocPlugin)

mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/project/build.properties

@@ -1 +1 @@
-sbt.version = 1.8.3
+sbt.version = 1.9.1

mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt

@@ -1,5 +1,5 @@
-ThisBuild / scalaVersion := "2.12.17"
-ThisBuild / crossScalaVersions := List("2.12.17", "2.13.10", "3.0.1")
+ThisBuild / scalaVersion := "2.12.18"
+ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11", "3.0.1")
 
 enablePlugins(MdocPlugin)
 mdocJS := Some(jsapp)

mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test

@@ -1,6 +1,6 @@
-> ++2.12.17 mdoc
+> ++2.12.18 mdoc
 > check
-> ++2.13.10 mdoc
+> ++2.13.11 mdoc
 > check
 > ++3.1.3 mdoc
 > check

project/build.properties

@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.1

tests/unit/src/test/scala/tests/markdown/NestSuite.scala

@@ -159,22 +159,22 @@ class NestSuite extends BaseMarkdownSuite {
     "implicit-ok".tag(SkipScala3),
     """
       |```scala mdoc
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:nest
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc
       |implicitly[Int]
       |```
     """.stripMargin,
     """|
        |```scala
-       |implicit val x = 1
+       |implicit val x: Int = 1
        |// x: Int = 1
        |```
        |```scala
-       |implicit val x = 1
+       |implicit val x: Int = 1
        |// x: Int = 1
        |```
        |```scala
@@ -219,10 +219,10 @@ class NestSuite extends BaseMarkdownSuite {
     "reset".tag(SkipScala3),
     """
       |```scala mdoc
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:nest
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:reset
       |implicitly[Int]
@@ -302,28 +302,28 @@ class NestSuite extends BaseMarkdownSuite {
     "multi-reset".tag(SkipScala3),
     """
       |```scala mdoc
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:nest
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:nest
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:nest
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:reset
       |implicitly[Int]
       |```
       |```scala mdoc:nest
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:nest
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:nest
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:reset
       |implicitly[Int]
@@ -345,10 +345,10 @@ class NestSuite extends BaseMarkdownSuite {
     "implicit-nok".tag(SkipScala3),
     """
       |```scala mdoc
-      |implicit val x = 1
+      |implicit val x: Int = 1
       |```
       |```scala mdoc:nest
-      |implicit val y = 1
+      |implicit val y: Int = 1
       |```
       |```scala mdoc
       |implicitly[Int]