Upgrade sbt versions to 0.13.18 and 1.2.8

Author: pvlugter

build.sbt

@@ -10,10 +10,7 @@ name := "sbt-javaagent"
 organization := "com.lightbend.sbt"
 
 // sbt cross build
-crossSbtVersions := Seq("0.13.16", "1.0.0-RC3")
-
-// fixed in https://github.com/sbt/sbt/pull/3397 (for sbt 0.13.17)
-sbtBinaryVersion in update := (sbtBinaryVersion in pluginCrossBuild).value
+crossSbtVersions := Seq("0.13.18", "1.2.8")
 
 // dependencies
 val packagerVersion = "1.2.2-RC2" // with sbt 1.0 cross build

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=0.13.18

src/sbt-test/agent/compile/test

@@ -1,3 +1,4 @@
+> set outputStrategy := Some(CustomOutput(new java.io.FileOutputStream(file("run.log"))))
 > checkDependency
 > compile
 > run

src/sbt-test/agent/compile/test.sbt

@@ -9,7 +9,7 @@ def expect(name: String, contents: String, expected: String): Unit =
   assert(contents contains expected, s"$name should contain '$expected'")
 
 TaskKey[Unit]("checkLog") := {
-  val log = IO.read(BuiltinCommands.lastLogFile(state.value).get)
+  val log = IO.read(file("run.log"))
   expect("run log", log, "Agent 86")
   expect("run log", log, "class maxwell.Maxwell")
 }

src/sbt-test/agent/confs/build.sbt

@@ -3,18 +3,3 @@ lazy val agentConfs = project in file(".") enablePlugins JavaAgent
 javaAgents += "sbt.javaagent.test" % "maxwell" % sys.props("project.version") % "compile;test"
 
 libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
-
-// send test stdout to log — works but should be easier?
-// outputStrategy is a setting, so it can't access tasks like streams
-testGrouping in Test := {
-  (testGrouping in Test).value map {
-    case group @ Tests.Group(_, _, Tests.SubProcess(forkOptions)) =>
-      group.copy(runPolicy = Tests.SubProcess(copyForkOptions(forkOptions, LoggedOutput(streams.value.log))))
-    case group => group
-  }
-}
-
-// copy manually to be compatible with both sbt 0.13 (case class) and sbt 1.0 (contraband)
-def copyForkOptions(o: ForkOptions, newOutputStrategy: OutputStrategy): ForkOptions = {
-  ForkOptions(o.javaHome, Some(newOutputStrategy), o.bootJars, o.workingDirectory, o.runJVMOptions, o.connectInput, o.envVars)
-}

src/sbt-test/agent/confs/test

@@ -1,5 +1,6 @@
+> set outputStrategy := Some(CustomOutput(new java.io.FileOutputStream(file("run.log"))))
 > run
-> checkLog
-> clearLog
+> checkRunLog
+> set outputStrategy := Some(CustomOutput(new java.io.FileOutputStream(file("test.log"))))
 > test
-> checkLog
+> checkTestLog

src/sbt-test/agent/confs/test.sbt

@@ -1,5 +1,8 @@
-TaskKey[Unit]("checkLog") := {
-  val log = IO.read(BuiltinCommands.lastLogFile(state.value).get)
+TaskKey[Unit]("checkRunLog") := checkLog("run.log")
+TaskKey[Unit]("checkTestLog") := checkLog("test.log")
+
+def checkLog(logFile: String): Unit = {
+  val log = IO.read(file(logFile))
 
   def expect(expected: String): Unit = {
     assert(log contains expected, s"log should contain '$expected'")
@@ -8,7 +11,3 @@ TaskKey[Unit]("checkLog") := {
   expect("Agent 86")
   expect("class maxwell.Maxwell")
 }
-
-TaskKey[Unit]("clearLog") := {
-  IO.write(BuiltinCommands.lastLogFile(state.value).get, "")
-}

src/sbt-test/agent/provided/test

@@ -1,3 +1,4 @@
+> set outputStrategy := Some(CustomOutput(new java.io.FileOutputStream(file("run.log"))))
 > compile
 > stage
 > run

src/sbt-test/agent/provided/test.sbt

@@ -2,10 +2,10 @@ TaskKey[Unit]("check") := {
   def expect(name: String, contents: String, expected: String): Unit =
     assert(contents contains expected, s"$name should contain '$expected'")
 
-  val lastLog = IO.read(BuiltinCommands.lastLogFile(state.value).get)
+  val log = IO.read(file("run.log"))
 
-  expect("run log", lastLog, "Agent 86")
-  expect("run log", lastLog, "class maxwell.Maxwell")
+  expect("run log", log, "Agent 86")
+  expect("run log", log, "class maxwell.Maxwell")
 
   import scala.sys.process._
   val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!

src/sbt-test/agent/run/test

@@ -1,2 +1,3 @@
+> set outputStrategy := Some(CustomOutput(new java.io.FileOutputStream(file("run.log"))))
 > run
 > check