Skip to content

Commit

Permalink
Cross build io (+ control) for playframework/playframework#6110
Browse files Browse the repository at this point in the history
  • Loading branch information
dwijnand committed Oct 20, 2016
1 parent 4b6c019 commit d32454c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ lazy val controlProj = (project in utilPath / "control").
baseSettings,
Util.crossBuild,
name := "Control",
crossScalaVersions := Seq(scala210, scala211)
crossScalaVersions := Seq(scala210, scala211, scala212)
)

lazy val collectionProj = (project in utilPath / "collection").
Expand Down Expand Up @@ -192,7 +192,7 @@ lazy val ioProj = (project in utilPath / "io").
Util.crossBuild,
name := "IO",
libraryDependencies += scalaCompiler.value % Test,
crossScalaVersions := Seq(scala210, scala211)
crossScalaVersions := Seq(scala210, scala211, scala212)
)

// Utilities related to reflection, managing Scala versions, and custom class loaders
Expand Down
3 changes: 2 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ object Dependencies {
lazy val scala292 = "2.9.2"
lazy val scala293 = "2.9.3"
lazy val scala210 = "2.10.6"
lazy val scala211 = "2.11.7"
lazy val scala211 = "2.11.8"
lazy val scala212 = "2.12.0-RC2"

lazy val jline = "jline" % "jline" % "2.13"
lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-2cf13e211b2cb31f0d3b317289dca70eca3362f6"
Expand Down

0 comments on commit d32454c

Please sign in to comment.