diff --git a/bin/test-release.sh b/bin/test-release.sh index 064cfc02..c77dff0d 100755 --- a/bin/test-release.sh +++ b/bin/test-release.sh @@ -9,8 +9,7 @@ coursier resolve \ org.scalameta:munit_2.11:$version \ org.scalameta:munit_2.12:$version \ org.scalameta:munit_2.13:$version \ - org.scalameta:munit_0.26:$version \ - org.scalameta:munit_0.27:$version \ + org.scalameta:munit_3.0:$version \ org.scalameta:munit_native0.4.0-M2_2.11:$version \ org.scalameta:munit_sjs0.6_2.11:$version \ org.scalameta:munit_sjs0.6_2.12:$version \ @@ -21,8 +20,7 @@ coursier resolve \ org.scalameta:munit-scalacheck_2.11:$version \ org.scalameta:munit-scalacheck_2.12:$version \ org.scalameta:munit-scalacheck_2.13:$version \ - org.scalameta:munit-scalacheck_0.26:$version \ - org.scalameta:munit-scalacheck_0.27:$version \ + org.scalameta:munit-scalacheck_3.0:$version \ org.scalameta:munit-scalacheck_native0.4.0-M2_2.11:$version \ org.scalameta:munit-scalacheck_sjs0.6_2.11:$version \ org.scalameta:munit-scalacheck_sjs0.6_2.12:$version \ diff --git a/build.sbt b/build.sbt index d21dc056..175dcd58 100644 --- a/build.sbt +++ b/build.sbt @@ -11,8 +11,7 @@ def previousVersion = "0.7.0" def scala213 = "2.13.2" def scala212 = "2.12.11" def scala211 = "2.11.12" -def dottyNext = "0.27.0-RC1" -def dottyStable = "0.26.0" +def scala3Stable = "3.0.0-M1" def junitVersion = "4.13" def gcp = "com.google.cloud" % "google-cloud-storage" % "1.113.2" inThisBuild( @@ -62,11 +61,11 @@ addCommandAlias( ) val isPreScala213 = Set[Option[(Long, Long)]](Some((2, 11)), Some((2, 12))) val scala2Versions = List(scala213, scala212, scala211) -val scala3Versions = List(dottyNext, dottyStable) +val scala3Versions = List(scala3Stable) val allScalaVersions = scala2Versions ++ scala3Versions def isNotScala211(v: Option[(Long, Long)]): Boolean = !v.contains((2, 11)) def isScala2(v: Option[(Long, Long)]): Boolean = v.exists(_._1 == 2) -def isScala3(v: Option[(Long, Long)]): Boolean = v.exists(_._1 == 0) +def isScala3(v: Option[(Long, Long)]): Boolean = v.exists(_._1 == 3) val isScalaJS = Def.setting[Boolean]( SettingKey[Boolean]("scalaJSUseMainModuleInitializer").?.value.isDefined ) @@ -132,7 +131,7 @@ val sharedSettings = List( "-Xexperimental", "-Ywarn-unused-import" ) - case Some((0, _)) => List() + case Some((3, _)) => List() case _ => List( "-target:jvm-1.8", @@ -191,7 +190,7 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform, NativePlatform) }, libraryDependencies ++= { CrossVersion.partialVersion(scalaVersion.value) match { - case Some((0, _)) => Nil + case Some((3, _)) => Nil case _ => List( "org.scala-lang" % "scala-reflect" % scalaVersion.value @@ -321,9 +320,8 @@ lazy val docs = project mdocExtraArguments := List("--no-link-hygiene"), mdocVariables := Map( "VERSION" -> version.value.replaceFirst("\\+.*", ""), - "DOTTY_VERSION" -> dottyNext, - "DOTTY_NEXT_VERSION" -> dottyNext, - "DOTTY_STABLE_VERSION" -> dottyStable, + "DOTTY_VERSION" -> scala3Stable, + "DOTTY_STABLE_VERSION" -> scala3Stable, "SUPPORTED_SCALA_VERSIONS" -> allScalaVersions.mkString(", ") ), fork := false diff --git a/docs/getting-started.md b/docs/getting-started.md index 4173d8bb..9e1e4df3 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -32,7 +32,6 @@ testFrameworks += new TestFramework("munit.Framework") | 2.11.x | ✅ | ✅ | ✅ | | 2.12.x | ✅ | ✅ | n/a | | 2.13.x | ✅ | ✅ | n/a | -| @DOTTY_NEXT_VERSION@ | ✅ | n/a | n/a | | @DOTTY_STABLE_VERSION@ | ✅ | n/a | n/a | Next, write a test suite. diff --git a/munit/shared/src/main/scala-3/munit/internal/MacroCompat.scala b/munit/shared/src/main/scala-3/munit/internal/MacroCompat.scala index 9f108422..d565a0b3 100644 --- a/munit/shared/src/main/scala-3/munit/internal/MacroCompat.scala +++ b/munit/shared/src/main/scala-3/munit/internal/MacroCompat.scala @@ -11,7 +11,7 @@ object MacroCompat { } def locationImpl()(using qctx: QuoteContext): Expr[Location] = { - import qctx.tasty.{_, given _} + import qctx.reflect._ val path = rootPosition.sourceFile.jpath.toString val startLine = rootPosition.startLine + 1 '{ new Location(${Expr(path)}, ${Expr(startLine)}) } @@ -22,9 +22,9 @@ object MacroCompat { } def clueImpl[T:Type](value: Expr[T])(using qctx: QuoteContext): Expr[Clue[T]] = { - import qctx.tasty.{_, given _} + import qctx.reflect._ val source = value.unseal.pos.sourceCode - val valueType = implicitly[scala.quoted.Type[T]].show + val valueType = Type[T].show '{ new Clue(${Expr(source)}, $value, ${Expr(valueType)}) } } diff --git a/tests/shared/src/test/scala/munit/BaseSuite.scala b/tests/shared/src/test/scala/munit/BaseSuite.scala index 5d03284a..bef18e70 100644 --- a/tests/shared/src/test/scala/munit/BaseSuite.scala +++ b/tests/shared/src/test/scala/munit/BaseSuite.scala @@ -12,7 +12,7 @@ class BaseSuite extends FunSuite { "BaseSuite", { test => def isDotty: Boolean = - BuildInfo.scalaVersion.startsWith("0.") + BuildInfo.scalaVersion.startsWith("3.") def is213: Boolean = BuildInfo.scalaVersion.startsWith("2.13") || isDotty if (test.tags(NoDotty) && isDotty) {