Skip to content

Commit

Permalink
Merge pull request #142 from travisbrown/update/2.13.0-RC3
Browse files Browse the repository at this point in the history
Update to Scala 2.13.0-RC3
  • Loading branch information
mpilquist authored Jun 1, 2019
2 parents 1f764be + 657606d commit 55505b3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ language: scala
scala:
- "2.11.12"
- "2.12.8"
- "2.13.0-RC2"
- "2.13.0-RC3"

jdk:
- oraclejdk8
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def ifAtLeast(scalaBinaryVersion: String, atLeastVersion: String)(options: Strin
else Seq.empty
}

lazy val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.0.8-RC4" % "test")
lazy val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.0.8-RC5" % "test")

lazy val nativeCommonSettings = Def.settings(
// https://github.com/scalatest/scalatest/issues/1112#issuecomment-366856502
Expand Down Expand Up @@ -45,7 +45,7 @@ lazy val commonSettings = Seq(
scalacOptions in (Compile, console) ~= { _ filterNot { o => o == "-Ywarn-unused-import" || o == "-Xfatal-warnings" } },
scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value,
scalaVersion := Scala211,
crossScalaVersions := Seq(Scala211, "2.12.8", "2.13.0-RC2"),
crossScalaVersions := Seq(Scala211, "2.12.8", "2.13.0-RC3"),
resolvers ++= Seq(
Resolver.sonatypeRepo("releases"),
Resolver.sonatypeRepo("snapshots")
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")
addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
Expand Down

0 comments on commit 55505b3

Please sign in to comment.