From 8c4945adcd873c8d3004973bd1d8764ac9c1d65c Mon Sep 17 00:00:00 2001
From: Gabriele Petronella <gabriele@buildo.io>
Date: Thu, 13 May 2021 17:15:54 +0200
Subject: [PATCH] Drop Scala 3.0.0-RC3

---
 bin/test-release.sh |  6 ++----
 build.sbt           | 10 +++-------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/bin/test-release.sh b/bin/test-release.sh
index dd36b357..92f4657c 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.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.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 001a06f8..ebd392ca 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"
-def scala3Previous = List("3.0.0-RC3")
+def scala3 = "3.0.0"
 def junitVersion = "4.13.2"
 def gcp = "com.google.cloud" % "google-cloud-storage" % "1.113.16"
 inThisBuild(
@@ -54,7 +53,7 @@ addCommandAlias(
 )
 val isPreScala213 = Set[Option[(Long, Long)]](Some((2, 11)), Some((2, 12)))
 val scala2Versions = List(scala213, scala212, scala211)
-val scala3Versions = scala3Stable :: scala3Previous
+val scala3Versions = List(scala3)
 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)
@@ -62,7 +61,7 @@ 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 =
@@ -174,9 +173,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(