Skip to content

Commit

Permalink
Update sbt to 0.13.13, fix deprecation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
magro committed Nov 2, 2016
1 parent 47c0642 commit 112c61e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
29 changes: 15 additions & 14 deletions project/ProjectSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,25 @@ object ProjectSettings {
// ----------------------------------------------------------------------

lazy val integrationTestSingleNodeSettings = Defaults.itSettings ++ Seq(
createHeaders in IntegrationTest <<= (createHeaders in IntegrationTest) triggeredBy (createHeaders in Test),
compile in IntegrationTest <<= (compile in IntegrationTest) triggeredBy (compile in Test),
test in IntegrationTest <<= (test in IntegrationTest) triggeredBy (test in Test),
createHeaders in IntegrationTest := ((createHeaders in IntegrationTest) triggeredBy (createHeaders in Test)).value,
compile in IntegrationTest := ((compile in IntegrationTest) triggeredBy (compile in Test)).value,
test in IntegrationTest := ((test in IntegrationTest) triggeredBy (test in Test)).value,
parallelExecution in IntegrationTest := false,
fork in IntegrationTest := true
)

lazy val integrationTestMultiNodeSettings = SbtMultiJvm.multiJvmSettings ++ Seq(
createHeaders in MultiJvm <<= (createHeaders in MultiJvm) triggeredBy (createHeaders in Test),
compile in MultiJvm <<= (compile in MultiJvm) triggeredBy (compile in Test),
executeTests in Test <<= (executeTests in Test, executeTests in MultiJvm) map {
case (testResults, multiJvmResults) =>
val overall =
if (testResults.overall.id < multiJvmResults.overall.id) multiJvmResults.overall
else testResults.overall
Tests.Output(overall,
testResults.events ++ multiJvmResults.events,
testResults.summaries ++ multiJvmResults.summaries)
createHeaders in MultiJvm := ((createHeaders in MultiJvm) triggeredBy (createHeaders in Test)).value,
compile in MultiJvm := ((compile in MultiJvm) triggeredBy (compile in Test)).value,
executeTests in Test := {
val testResults = (executeTests in Test).value
val multiJvmResults = (executeTests in MultiJvm).value
val overall =
if (testResults.overall.id < multiJvmResults.overall.id) multiJvmResults.overall
else testResults.overall
Tests.Output(overall,
testResults.events ++ multiJvmResults.events,
testResults.summaries ++ multiJvmResults.summaries)
}
)

Expand Down Expand Up @@ -179,7 +180,7 @@ object ProjectSettings {
lazy val generateClasspath = taskKey[Unit]("generate example classpath script")

Seq(
generateClasspath <<= generateClasspath.dependsOn(sbt.Keys.compile in Test),
generateClasspath := (generateClasspath dependsOn (sbt.Keys.compile in Test)).value,
generateClasspath := {
val cpaths = (fullClasspath in Compile).value.map(_.data).mkString(":")
val output =
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=0.13.11
sbt.version=0.13.13

0 comments on commit 112c61e

Please sign in to comment.