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

Jump to bottom

support Scala 2.13.0-M5 (and drop M4) #427

Merged
merged 1 commit into from
Sep 19, 2018
Merged

support Scala 2.13.0-M5 (and drop M4) #427

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: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ scala:
- 2.10.7
- 2.11.12
- 2.12.6
- 2.13.0-M4
- 2.13.0-M5
jdk:
- oraclejdk8
env:
Expand Down Expand Up @@ -48,5 +48,5 @@ matrix:
exclude:
- scala: 2.10.7
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M3
- scala: 2.13.0-M4
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M3
- scala: 2.13.0-M5
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=0.6.25
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SethTisue updated 0.6.25 in Travis, but missed the value inplugins.sbt, as well

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this is an exclude rule, so I'm wrong about the first part, but I think I'm right about the second part. It's important because I don't think Rickard uses Travis to deploy

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ashawley nice catch! #435

17 changes: 8 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))

lazy val scalaVersionSettings = Seq(
scalaVersion := "2.12.6",
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.13.0-M4", scalaVersion.value),
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.13.0-M5", scalaVersion.value),
scalaMajorVersion := {
val v = scalaVersion.value
CrossVersion.partialVersion(v).map(_._2.toInt).getOrElse {
Expand Down Expand Up @@ -70,15 +70,14 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
"-unchecked",
"-Xfuture",
"-Ywarn-dead-code",
"-Ywarn-inaccessible",
"-Ywarn-nullary-override",
"-Ywarn-nullary-unit",
"-Ywarn-numeric-widen") ++ {
val modern = Seq("-Xlint:-unused", "-Ywarn-infer-any", "-Ywarn-unused-import", "-Ywarn-unused:-patvars,-implicits,-locals,-privates,-explicits")
val modern = Seq("-Xlint:-unused", "-Ywarn-unused:-patvars,-implicits,-locals,-privates,-explicits")
val removed = Seq("-Ywarn-inaccessible", "-Ywarn-nullary-override", "-Ywarn-nullary-unit")
val removedModern = Seq("-Ywarn-infer-any", "-Ywarn-unused-import")
scalaMajorVersion.value match {
case 10 => Seq("-Xfatal-warnings", "-Xlint")
case 11 => Seq("-Xfatal-warnings", "-Xlint", "-Ywarn-infer-any", "-Ywarn-unused-import")
case 12 => "-Xfatal-warnings" +: modern
case 10 => Seq("-Xfatal-warnings", "-Xlint") ++ removed
case 11 => Seq("-Xfatal-warnings", "-Xlint", "-Ywarn-infer-any", "-Ywarn-unused-import") ++ removed
case 12 => "-Xfatal-warnings" +: (modern ++ removed ++ removedModern)
case 13 => modern
}
},
Expand All @@ -93,7 +92,7 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
scalacOptions in Test ~= (_ filterNot (_ == "-Xfatal-warnings")),

mimaPreviousArtifacts := {
// TODO: re-enable MiMa for 2.13.0-M4 once there is a release out
// TODO: re-enable MiMa for 2.13 once there is a release out
if (scalaMajorVersion.value == 13) Set()
else Set("org.scalacheck" %% "scalacheck" % "1.14.0")
},
Expand Down