Skip to content

Commit

Permalink
Merge pull request pniederw#8 from eed3si9n/wip/2.13.0-M5
Browse files Browse the repository at this point in the history
Scala 2.13.0-M5
  • Loading branch information
eed3si9n authored Oct 12, 2018
2 parents 4327f8a + f1e81ed commit e21e407
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ env:
scala:
- 2.10.7
- 2.11.12
- 2.12.6
- 2.12.7
- 2.13.0-M5

matrix:
include:
- scala: 2.12.6
- scala: 2.12.7
jdk: openjdk11
env: TEST_PROJECT="expectyJVM"
- scala: 2.11.12
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import sbtcrossproject.{crossProject, CrossType}

ThisBuild / version := "0.11.0-SNAPSHOT"
ThisBuild / scalaVersion := "2.12.6"
ThisBuild / crossScalaVersions := Vector("2.12.6", "2.13.0-M4", "2.11.12", "2.10.6")
ThisBuild / scalaVersion := "2.12.7"
ThisBuild / crossScalaVersions := Vector("2.12.7", "2.13.0-M5", "2.11.12", "2.10.6")

lazy val root = (project in file("."))
.aggregate(expectyJVM, expectyJS)
Expand All @@ -25,7 +25,7 @@ lazy val expecty = crossProject(JVMPlatform, JSPlatform, NativePlatform).in(file
else Nil
},
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
libraryDependencies += "com.lihaoyi" %%% "utest" % "0.6.3" % Test,
libraryDependencies += "com.lihaoyi" %%% "utest" % "0.6.6" % Test,
testFrameworks += new TestFramework("utest.runner.Framework"),
)
.jvmSettings(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.5
sbt.version=1.2.4
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.4.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.7")

0 comments on commit e21e407

Please sign in to comment.