luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2794 from dwijnand/212 

Cross build io (+ control) for playframework/playframework#6110
This commit is contained in:
eugene yokota 2016-10-24 13:38:33 -04:00 committed by GitHub
parent a3357af540 d32454c6e7
commit 47a71c0ff5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -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").
@ -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

3
project/Dependencies.scala
View File

@ -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"