Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Scala 3.0.0-RC3 #361

Merged
merged 1 commit into from
May 13, 2021
Merged

Drop Scala 3.0.0-RC3 #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions bin/test-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
10 changes: 3 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -54,15 +53,15 @@ 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)
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 =
Expand Down Expand Up @@ -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(
Expand Down