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

Fix test dependencies, cross compile all projects

This commit is contained in:
Martin Duhem 2015-08-31 00:57:00 +02:00
parent ef7ff653cb
commit 8eae9ba726
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.sbt
View File

@ -25,15 +25,14 @@ def commonSettings: Seq[Setting[_]] = Seq(
// concurrentRestrictions in Global += Util.testExclusiveRestriction,
testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
incOptions := incOptions.value.withNameHashing(true)
// crossScalaVersions := Seq(scala210)
incOptions := incOptions.value.withNameHashing(true),
crossScalaVersions := Seq(scala210, scala211)
// bintrayPackage := (bintrayPackage in ThisBuild).value,
// bintrayRepository := (bintrayRepository in ThisBuild).value
)
// def testedBaseSettings: Seq[Setting[_]] =
// baseSettings ++ testDependencies
def testedBaseSettings: Seq[Setting[_]] = commonSettings
def testedBaseSettings: Seq[Setting[_]] =
commonSettings ++ testDependencies
lazy val utilRoot: Project = (project in file(".")).
// configs(Sxr.sxrConf).

9
project/Dependencies.scala
View File

@ -18,8 +18,6 @@ object Dependencies {
// lazy val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive ()
lazy val sbtSerialization = "org.scala-sbt" %% "serialization" % "0.1.2"
lazy val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.2"
// lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.11.4"
// lazy val specs2 = "org.specs2" %% "specs2" % "2.3.11"
// lazy val junit = "junit" % "junit" % "4.11"
lazy val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
lazy val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
@ -31,4 +29,11 @@ object Dependencies {
}
}
lazy val scalaXml = scala211Module("scala-xml", "1.0.1")
lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.11.4"
lazy val specs2 = "org.specs2" %% "specs2" % "2.3.11"
lazy val testDependencies = libraryDependencies ++= Seq(
scalaCheck,
specs2
)
}