Merge pull request #312 from tgodzik/update-3.0.0-RC1

scalameta · Feb 16, 2021 · 63b8286 · 63b8286
2 parents 3aad999 + cfc27b9
commit 63b8286
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 65 deletions.
diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -9,8 +9,8 @@ coursier resolve \
   org.scalameta:munit_2.11:$version \
   org.scalameta:munit_2.12:$version \
   org.scalameta:munit_2.13:$version \
-  org.scalameta:munit_3.0.0-M2:$version \
   org.scalameta:munit_3.0.0-M3:$version \
+  org.scalameta:munit_3.0.0-RC1:$version \
   org.scalameta:munit_0.27:$version \
   org.scalameta:munit_native0.4.0_2.11:$version \
   org.scalameta:munit_native0.4.0_2.12:$version \
@@ -22,8 +22,8 @@ coursier resolve \
   org.scalameta:munit-scalacheck_2.12:$version \
   org.scalameta:munit-scalacheck_2.13:$version \
   org.scalameta:munit-scalacheck_0.27:$version \
-  org.scalameta:munit-scalacheck_3.0.0-M2:$version \
   org.scalameta:munit-scalacheck_3.0.0-M3:$version \
+  org.scalameta:munit-scalacheck_3.0.0-RC1:$version \
   org.scalameta:munit-scalacheck_native0.4.0_2.11:$version \
   org.scalameta:munit-scalacheck_native0.4.0_2.12:$version \
   org.scalameta:munit-scalacheck_native0.4.0_2.13:$version \

diff --git a/build.sbt b/build.sbt
@@ -10,8 +10,8 @@ def previousVersion = "0.7.0"
 def scala213 = "2.13.4"
 def scala212 = "2.12.13"
 def scala211 = "2.11.12"
-def scala3Stable = "3.0.0-M3"
-def scala3Previous = List("3.0.0-M2")
+def scala3Stable = "3.0.0-RC1"
+def scala3Previous = List("3.0.0-M3")
 def junitVersion = "4.13.2"
 def gcp = "com.google.cloud" % "google-cloud-storage" % "1.113.9"
 inThisBuild(
@@ -250,7 +250,13 @@ lazy val munitScalacheck = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(
     moduleName := "munit-scalacheck",
     sharedSettings,
-    libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.2"
+    libraryDependencies += {
+      val partialVersion = CrossVersion.partialVersion(scalaVersion.value)
+      if (isNotScala211(partialVersion))
+        "org.scalacheck" %%% "scalacheck" % "1.15.3"
+      else
+        "org.scalacheck" %%% "scalacheck" % "1.15.2"
+    }
   )
   .jvmSettings(
     sharedJVMSettings

diff --git a/munit/shared/src/main/scala-3.0.0-M2/munit/internal/MacroCompat.scala b/munit/shared/src/main/scala-3.0.0-M2/munit/internal/MacroCompat.scala
diff --git a/...3.0.0-M3/munit/internal/MacroCompat.scala → .../scala-3/munit/internal/MacroCompat.scala b/...3.0.0-M3/munit/internal/MacroCompat.scala → .../scala-3/munit/internal/MacroCompat.scala
@@ -27,7 +27,7 @@ object MacroCompat {
 
   def clueImpl[T: Type](value: Expr[T])(using Quotes): Expr[Clue[T]] = {
     import quotes.reflect._
-    val source = Term.of(value).pos.sourceCode.getOrElse("")
+    val source = value.asTerm.pos.sourceCode.getOrElse("")
     val valueType = TypeTree.of[T].show(using Printer.TreeShortCode)
     '{ new Clue(${Expr(source)}, $value, ${Expr(valueType)}) }
   }

diff --git a/tests/shared/src/main/scala/munit/Tags.scala b/tests/shared/src/main/scala/munit/Tags.scala
@@ -2,5 +2,4 @@ package munit
 
 object OnlyJVM extends Tag("OnlyJVm") {}
 object NoDotty extends Tag("NoDotty") {}
-object OnlyFromM3 extends Tag("OnlyFromM3") {}
 object Only213 extends Tag("Only213") {}
diff --git a/tests/shared/src/test/scala/munit/AssertionsSuite.scala b/tests/shared/src/test/scala/munit/AssertionsSuite.scala
@@ -8,7 +8,7 @@ class AssertionsSuite extends BaseSuite {
       cond: => Boolean,
       expected: String
   )(implicit loc: Location): Unit =
-    test(name.tag(OnlyFromM3)) {
+    test(name) {
       val (_, clues) = munitCaptureClues(cond)
       assertNoDiff(Printers.print(clues), expected)
     }

diff --git a/tests/shared/src/test/scala/munit/BaseSuite.scala b/tests/shared/src/test/scala/munit/BaseSuite.scala
@@ -15,10 +15,6 @@ class BaseSuite extends FunSuite {
             BuildInfo.scalaVersion.startsWith("2.13") || isDotty
           if (test.tags(NoDotty) && isDotty) {
             test.tag(Ignore)
-          } else if (
-            test.tags(OnlyFromM3) && "3.0.0-M2" == BuildInfo.scalaVersion
-          ) {
-            test.tag(Ignore)
           } else if (test.tags(Only213) && !is213) {
             test.tag(Ignore)
           } else if (test.tags(OnlyJVM) && !PlatformCompat.isJVM) {

diff --git a/tests/shared/src/test/scala/munit/TypeCheckSuite.scala b/tests/shared/src/test/scala/munit/TypeCheckSuite.scala
@@ -35,7 +35,7 @@ class TypeCheckSuite extends FunSuite {
            |msg.foobar
            |    ^
            |""".stripMargin,
-      "3" ->
+      "3.0.0-M3" ->
         """|error:
            |value foobar is not a member of String, but could be made available as an extension method.
            |
@@ -45,6 +45,17 @@ class TypeCheckSuite extends FunSuite {
            |
            |msg.foobar
            |   ^
+           |""".stripMargin,
+      "3.0.0-RC1" ->
+        """|error:
+           |value foobar is not a member of String, but could be made available as an extension method.
+           |
+           |The following import might make progress towards fixing the problem:
+           |
+           |  import munit.Clue.generate
+           |
+           |msg.foobar
+           |   ^
            |""".stripMargin
     )
   )

diff --git a/website/i18n/en.json b/website/i18n/en.json
@@ -17,6 +17,9 @@
       "getting-started": {
         "title": "Getting started"
       },
+      "integrations/external-integrations": {
+        "title": "External Integrations"
+      },
       "integrations/scalacheck": {
         "title": "ScalaCheck"
       },