Drop Scala 3 RC versions and bump newest to 3.0.1

scalameta · Jul 22, 2021 · 0ff2132 · 0ff2132
1 parent 101a055
commit 0ff2132
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 134 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
           - "'++2.12.12 test'"
           - "'++2.12.14 test' scripted"
           - "'++2.13.6 test'"
-          - "'++3.0.0 test'"
+          - "'++3.0.1 test'"
     steps:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v12

diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -9,9 +9,6 @@ coursier fetch \
   org.scalameta:mdoc_2.11:$version \
   org.scalameta:mdoc_2.12:$version \
   org.scalameta:mdoc_2.13:$version \
-  org.scalameta:mdoc_3.0.0-RC1:$version \
-  org.scalameta:mdoc_3.0.0-RC2:$version \
-  org.scalameta:mdoc_3.0.0-RC3:$version \
   org.scalameta:mdoc_3:$version \
   org.scalameta:mdoc-js_2.11:$version \
   org.scalameta:mdoc-js_2.12:$version \

diff --git a/build.sbt b/build.sbt
@@ -3,9 +3,9 @@ import scala.collection.mutable
 def scala212 = "2.12.14"
 def scala211 = "2.11.12"
 def scala213 = "2.13.6"
-def scala3 = List("3.0.0", "3.0.0-RC3", "3.0.0-RC2", "3.0.0-RC1")
+def scala3 = "3.0.1"
 def scala2Versions = List(scala212, scala211, scala213)
-def allScalaVersions = scala2Versions ::: scala3
+def allScalaVersions = scala2Versions :+ scala3
 
 def scalajs = "1.5.1"
 def scalajsBinaryVersion = "1"
@@ -68,7 +68,7 @@ def crossSetting[A](
 inThisBuild(
   List(
     scalaVersion := scala213,
-    crossScalaVersions := scala2Versions ::: scala3,
+    crossScalaVersions := allScalaVersions,
     organization := "org.scalameta",
     licenses := Seq(
       "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")
@@ -130,7 +130,6 @@ lazy val fansiVersion = Def.setting {
 
 lazy val fs2Version = Def.setting {
   if (scalaVersion.value.startsWith("2.11")) "2.1.0"
-  else if (scalaVersion.value == "3.0.0-RC1") "2.5.4"
   else "2.5.5"
 }
 

diff --git a/runtime/src/main/scala-3.0.0-RC2/mdoc/internal/pprint/TypePrinter.scala b/runtime/src/main/scala-3.0.0-RC2/mdoc/internal/pprint/TypePrinter.scala
diff --git a/runtime/src/main/scala-3.0.0-RC2/mdoc/internal/sourcecode/Macros.scala b/runtime/src/main/scala-3.0.0-RC2/mdoc/internal/sourcecode/Macros.scala
diff --git a/runtime/src/main/scala-3.0.0-RC3/mdoc/internal/pprint/TypePrinter.scala b/runtime/src/main/scala-3.0.0-RC3/mdoc/internal/pprint/TypePrinter.scala
diff --git a/runtime/src/main/scala-3.0.0-RC3/mdoc/internal/sourcecode/Macros.scala b/runtime/src/main/scala-3.0.0-RC3/mdoc/internal/sourcecode/Macros.scala
diff --git a/runtime/src/main/scala-3.0.0/mdoc/internal/pprint/TypePrinter.scala b/runtime/src/main/scala-3.0.0/mdoc/internal/pprint/TypePrinter.scala
diff --git a/runtime/src/main/scala-3.0.0/mdoc/internal/sourcecode/Macros.scala b/runtime/src/main/scala-3.0.0/mdoc/internal/sourcecode/Macros.scala
diff --git a/...C1/mdoc/internal/pprint/TypePrinter.scala → ...-3/mdoc/internal/pprint/TypePrinter.scala b/...C1/mdoc/internal/pprint/TypePrinter.scala → ...-3/mdoc/internal/pprint/TypePrinter.scala
diff --git a/...RC1/mdoc/internal/sourcecode/Macros.scala → ...a-3/mdoc/internal/sourcecode/Macros.scala b/...RC1/mdoc/internal/sourcecode/Macros.scala → ...a-3/mdoc/internal/sourcecode/Macros.scala