Skip to content

Update scala 2.13.0-RC2 to 2.13.0-RC3 #108

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

Merged
merged 2 commits into from
May 31, 2019
Merged

Update scala 2.13.0-RC2 to 2.13.0-RC3 #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fa55e9
Update scalatest to 3.0.8-RC5
Philippus May 31, 2019
27ae016
Update scala 2.13.0-RC2 to 2.13.0-RC3
Philippus May 31, 2019
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
16 changes: 6 additions & 10 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")

// Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
scalaVersionsByJvm in ThisBuild := Map(
8 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> true),
9 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
10 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
11 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false),
12 -> List("2.11.12", "2.12.8", "2.13.0-RC2").map(_ -> false)
8 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> true),
9 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
10 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
11 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
12 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false)
)

scalaVersion in ThisBuild := "2.12.8"
Expand All @@ -29,11 +29,7 @@ shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project
lazy val swing = project.in(file("."))
.settings(
libraryDependencies += {
if (scalaVersion.value == "2.13.0-RC2") {
"org.scalatest" % "scalatest_2.13.0-RC1" % "3.0.8-RC2" % Test // it works
} else {
"org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test
}
"org.scalatest" %% "scalatest" % "3.0.8-RC5" % Test
},
// Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
// and a `src/main/scala-2.13-` source directory for Scala version older than 2.13
Expand Down