diff --git a/bin/test-release.sh b/bin/test-release.sh index dd36b357..63152ce6 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_3.0.0-RC2:$version \ - org.scalameta:munit_3.0.0-RC3:$version \ + org.scalameta:munit_3.0:$version \ org.scalameta:munit_native0.4_2.11:$version \ org.scalameta:munit_native0.4_2.12:$version \ org.scalameta:munit_native0.4_2.13:$version \ @@ -20,8 +19,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_3.0.0-RC2:$version \ - org.scalameta:munit-scalacheck_3.0.0-RC3:$version \ + org.scalameta:munit-scalacheck_3.0:$version \ org.scalameta:munit-scalacheck_native0.4_2.11:$version \ org.scalameta:munit-scalacheck_native0.4_2.12:$version \ org.scalameta:munit-scalacheck_native0.4_2.13:$version \ diff --git a/build.sbt b/build.sbt index 790d5804..b6137821 100644 --- a/build.sbt +++ b/build.sbt @@ -10,8 +10,7 @@ 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-RC3" -def scala3Previous = List("3.0.0-RC2") +def scala3 = "3.0.0" def junitVersion = "4.13.2" def gcp = "com.google.cloud" % "google-cloud-storage" % "1.113.16" inThisBuild( @@ -54,15 +53,14 @@ addCommandAlias( ) val isPreScala213 = Set[Option[(Long, Long)]](Some((2, 11)), Some((2, 12))) val scala2Versions = List(scala213, scala212, scala211) -val scala3Versions = scala3Stable :: scala3Previous -val allScalaVersions = scala2Versions ++ scala3Versions +val allScalaVersions = scala2Versions :+ scala3 def isNotScala211(v: Option[(Long, Long)]): Boolean = !v.contains((2, 11)) def isScala2(v: Option[(Long, Long)]): Boolean = v.exists(_._1 == 2) val isScala3Setting = Def.setting { isScala3(CrossVersion.partialVersion(scalaVersion.value)) } -def isScala3(v: Option[(Long, Long)]): Boolean = v.exists(_._1 != 2) +def isScala3(v: Option[(Long, Long)]): Boolean = v.exists(_._1 == 3) // NOTE(olafur): disable Scala.js and Native settings for IntelliJ. lazy val skipIdeaSettings = @@ -101,7 +99,7 @@ val sharedJVMSettings: List[Def.Setting[_]] = List( ) ++ mimaEnable val sharedJSSettings: List[Def.Setting[_]] = List( skipIdeaSettings, - crossScalaVersions := allScalaVersions.filterNot(_.startsWith("0.")), + crossScalaVersions := allScalaVersions, scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)) ) val sharedJSConfigure: Project => Project = @@ -174,9 +172,6 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform, NativePlatform) if (isScala2(partialVersion)) { result += base / "scala-2" } - if (isScala3(partialVersion)) { - result += base / "scala-3" - } result.toList }, libraryDependencies ++= List( @@ -305,10 +300,7 @@ lazy val docs = project (ThisBuild / baseDirectory).value / "website" / "target" / "docs", mdocExtraArguments := List("--no-link-hygiene"), mdocVariables := Map( - "VERSION" -> version.value.replaceFirst("\\+.*", ""), - "SCALA3_PREVIOUS_VERSION" -> scala3Stable, - "SCALA3_STABLE_VERSION" -> scala3Previous.head, - "SUPPORTED_SCALA_VERSIONS" -> allScalaVersions.mkString(", ") + "VERSION" -> version.value.replaceFirst("\\+.*", "") ), fork := false ) diff --git a/docs/getting-started.md b/docs/getting-started.md index 0d58e83a..534893fc 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -69,13 +69,12 @@ object test extends Tests { } ``` -| Scala Version | JVM | Scala.js (0.6.x) | Scala.js (1.x) | Native (0.4.x) | -| ------------------------- | :-: | :--------------: | :------------: | :------------: | -| 2.11.x | ✅ | ✅ until 0.7.16 | ✅ | ✅ | -| 2.12.x | ✅ | ✅ until 0.7.16 | ✅ | ✅ | -| 2.13.x | ✅ | ✅ until 0.7.16 | ✅ | ✅ | -| @SCALA3_PREVIOUS_VERSION@ | ✅ | n/a | ✅ | n/a | -| @SCALA3_STABLE_VERSION@ | ✅ | n/a | ✅ | n/a | +| Scala Version | JVM | Scala.js (0.6.x) | Scala.js (1.x) | Native (0.4.x) | +| ------------- | :-: | :--------------: | :------------: | :------------: | +| 2.11.x | ✅ | ✅ until 0.7.16 | ✅ | ✅ | +| 2.12.x | ✅ | ✅ until 0.7.16 | ✅ | ✅ | +| 2.13.x | ✅ | ✅ until 0.7.16 | ✅ | ✅ | +| 3.0.x | ✅ | n/a | ✅ | n/a | Next, write a test suite.