Add cross build for sbt 1.0

pvlugter · bantonsson · commit 8a41213a26b1 · 2017-08-09T08:35:07.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,3 @@
 language: scala
-
-scala:
-  - 2.10.6
+jdk: oraclejdk8
+script: sbt "^ scripted"
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2016 Lightbend Inc. [https://www.lightbend.com]
+Copyright 2016-2017 Lightbend Inc. [https://www.lightbend.com]
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Lightbend, Inc. <http://www.lightbend.com>
+ * Copyright © 2016-2017 Lightbend, Inc. <http://www.lightbend.com>
  */
 
 lazy val `sbt-javaagent` = project in file(".")
@@ -9,15 +9,24 @@ sbtPlugin := true
 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
+
 // dependencies
-val packagerVersion = "1.0.6"
-val packager11xVersion = "1.1.5"
-val packager12xVersion = "1.2.0"
+val packagerVersion = "1.2.2-RC2" // with sbt 1.0 cross build
+val packager10xVersion = "1.0.6"
+val packager11xVersion = "1.1.6"
+val packager12xVersion = "1.2.1"
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % packagerVersion % "provided")
 
 // compile settings
-scalacOptions ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-unchecked", "-deprecation", "-feature")
-javacOptions ++= Seq("-encoding", "UTF-8", "-source", "1.6", "-target", "1.6")
+scalacOptions ++= Seq("-encoding", "UTF-8", "-unchecked", "-deprecation", "-feature") ++
+  { if ((sbtBinaryVersion in pluginCrossBuild).value == "0.13") Seq("-target:jvm-1.6") else Seq.empty }
+javacOptions ++= Seq("-encoding", "UTF-8") ++
+  { if ((sbtBinaryVersion in pluginCrossBuild).value == "0.13") Seq("-source", "1.6", "-target", "1.6") else Seq.empty }
 
 // test agent
 lazy val maxwell = project
@@ -36,6 +45,7 @@ scriptedSettings
 scriptedLaunchOpts ++= Seq(
   "-Dproject.version=" + version.value,
   "-Dpackager.version=" + packagerVersion,
+  "-Dpackager.10x.version=" + packager10xVersion,
   "-Dpackager.11x.version=" + packager11xVersion,
   "-Dpackager.12x.version=" + packager12xVersion
 )
@@ -48,10 +58,50 @@ test in Test := {
   ScriptedPlugin.scripted.toTask("").value
 }
 
+// cross-sbt scripted tests
+resourceDirectory in scriptedTests := sourceDirectory.value / "sbt-test"
+resourceDirectories in scriptedTests := Seq((resourceDirectory in scriptedTests).value)
+resourceDirectories in scriptedTests += sourceDirectory.value / ("sbt-test-" + (sbtBinaryVersion in pluginCrossBuild).value)
+includeFilter in scriptedTests := AllPassFilter
+excludeFilter in scriptedTests := HiddenFileFilter
+resources in scriptedTests := Defaults.collectFiles(resourceDirectories in scriptedTests, includeFilter in scriptedTests, excludeFilter in scriptedTests).value
+target in scriptedTests := crossTarget.value / "sbt-test"
+copyResources in scriptedTests := {
+  val testResources = (resources in scriptedTests).value
+  val testDirectories = (resourceDirectories in scriptedTests).value
+  val testTarget = (target in scriptedTests).value
+  val cacheFile = streams.value.cacheDirectory / "copy-sbt-test"
+  val mappings = (testResources --- testDirectories) pair (rebase(testDirectories, testTarget) | flat(testTarget))
+  Sync(cacheFile)(mappings)
+  mappings
+}
+sbtTestDirectory := (target in scriptedTests).value
+scriptedDependencies := {
+  scriptedDependencies.value
+  (copyResources in scriptedTests).value
+}
+
 // publish settings
 publishMavenStyle := false
 bintrayOrganization := Some("sbt")
 bintrayRepository := "sbt-plugin-releases"
 bintrayPackage := "sbt-javaagent"
 bintrayReleaseOnPublish := false
 licenses += "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")
+
+// release settings
+import ReleaseTransformations._
+releaseProcess := Seq[ReleaseStep](
+  checkSnapshotDependencies,
+  inquireVersions,
+  runClean,
+  releaseStepCommandAndRemaining("^ scripted"),
+  setReleaseVersion,
+  commitReleaseVersion,
+  tagRelease,
+  releaseStepCommandAndRemaining("^ publish"),
+  releaseStepTask(bintrayRelease),
+  setNextVersion,
+  commitNextVersion,
+  pushChanges
+)
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.16
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
 /*
- * Copyright © 2016 Lightbend, Inc. <http://www.lightbend.com>
+ * Copyright © 2016-2017 Lightbend, Inc. <http://www.lightbend.com>
  */
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
 addSbtPlugin("me.lessis"         % "bintray-sbt" % "0.3.0")
 
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
diff --git a/src/main/scala-sbt-0.13/com/lightbend/sbt/javaagent/Modules.scala b/src/main/scala-sbt-0.13/com/lightbend/sbt/javaagent/Modules.scala
@@ -0,0 +1,20 @@
+/*
+ * Copyright © 2016-2017 Lightbend, Inc. <http://www.lightbend.com>
+ */
+
+package com.lightbend.sbt.javaagent
+
+import sbt.{ ModuleFilter, ModuleID }
+
+object Modules {
+  def withConfigurations(module: ModuleID, configurations: Option[String]): ModuleID =
+    module.copy(configurations = configurations)
+
+  def exactFilter(module: ModuleID) = new ModuleFilter {
+    def apply(m: ModuleID) = {
+      m.organization == module.organization &&
+      m.name         == module.name &&
+      m.revision     == module.revision
+    }
+  }
+}
diff --git a/src/main/scala-sbt-1.0/com/lightbend/sbt/javaagent/Modules.scala b/src/main/scala-sbt-1.0/com/lightbend/sbt/javaagent/Modules.scala
@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2016-2017 Lightbend, Inc. <http://www.lightbend.com>
+ */
+
+package com.lightbend.sbt.javaagent
+
+import sbt.ModuleID
+import sbt.librarymanagement.ModuleFilter
+
+object Modules {
+  def withConfigurations(module: ModuleID, configurations: Option[String]): ModuleID =
+    module.withConfigurations(configurations)
+
+  def exactFilter(module: ModuleID) = new ModuleFilter {
+    def apply(m: ModuleID) = {
+      m.organization == module.organization &&
+      m.name         == module.name &&
+      m.revision     == module.revision
+    }
+  }
+}
diff --git a/src/main/scala/com/lightbend/sbt/javaagent/JavaAgent.scala b/src/main/scala/com/lightbend/sbt/javaagent/JavaAgent.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Lightbend, Inc. <http://www.lightbend.com>
+ * Copyright © 2016-2017 Lightbend, Inc. <http://www.lightbend.com>
  */
 
 package com.lightbend.sbt.javaagent
@@ -49,7 +49,7 @@ object JavaAgent extends AutoPlugin {
     val inTest = scope.test || confs.contains(Test.name)
     val inDist = scope.dist
     val configuration = if (inCompile) Provided else AgentConfig
-    val reconfiguredModule = module.copy(configurations = Some(configuration.name))
+    val reconfiguredModule = Modules.withConfigurations(module, Some(configuration.name))
     val configuredScope = AgentScope(compile = inCompile, test = inTest, run = inRun, dist = inDist)
     AgentModule(agentName, reconfiguredModule, configuredScope, agentArguments)
   }
@@ -70,20 +70,12 @@ object JavaAgent extends AutoPlugin {
 
   private def resolveAgents = Def.task[Seq[ResolvedAgent]] {
     javaAgents.value flatMap { agent =>
-      update.value.matching(exactModuleFilter(agent.module)).headOption map {
+      update.value.matching(Modules.exactFilter(agent.module)).headOption map {
         jar => ResolvedAgent(agent, jar)
       }
     }
   }
 
-  private def exactModuleFilter(module: ModuleID) = new ModuleFilter {
-    def apply(m: ModuleID) = {
-      m.organization == module.organization &&
-      m.name         == module.name &&
-      m.revision     == module.revision
-    }
-  }
-
   private def enableFork(forkKey: SettingKey[Boolean], enabled: AgentModule => Boolean) = Def.setting[Boolean] {
     forkKey.value || javaAgents.value.exists(enabled)
   }
diff --git a/src/main/scala/com/lightbend/sbt/javaagent/JavaAgentPackaging.scala b/src/main/scala/com/lightbend/sbt/javaagent/JavaAgentPackaging.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Lightbend, Inc. <http://www.lightbend.com>
+ * Copyright © 2016-2017 Lightbend, Inc. <http://www.lightbend.com>
  */
 
 package com.lightbend.sbt.javaagent
diff --git a/src/sbt-test-0.13/agent/dist_1.0.x/build.sbt b/src/sbt-test-0.13/agent/dist_1.0.x/build.sbt
diff --git a/src/sbt-test-0.13/agent/dist_1.0.x/project/plugins.sbt b/src/sbt-test-0.13/agent/dist_1.0.x/project/plugins.sbt
@@ -0,0 +1,2 @@
+addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.10x.version"))
diff --git a/src/sbt-test-0.13/agent/dist_1.0.x/src/main/scala/Main.scala b/src/sbt-test-0.13/agent/dist_1.0.x/src/main/scala/Main.scala
diff --git a/src/sbt-test-0.13/agent/dist_1.0.x/test b/src/sbt-test-0.13/agent/dist_1.0.x/test
diff --git a/src/sbt-test-0.13/agent/dist_1.0.x/test.sbt b/src/sbt-test-0.13/agent/dist_1.0.x/test.sbt
@@ -4,6 +4,7 @@ TaskKey[Unit]("check") := {
     "dist mappings do not include 'maxwell/maxwell.jar'"
   )
 
+  import scala.sys.process._
   val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!
 
   assert(
diff --git a/src/sbt-test-0.13/agent/dist_1.1.x/build.sbt b/src/sbt-test-0.13/agent/dist_1.1.x/build.sbt
diff --git a/src/sbt-test-0.13/agent/dist_1.1.x/project/plugins.sbt b/src/sbt-test-0.13/agent/dist_1.1.x/project/plugins.sbt
diff --git a/src/sbt-test-0.13/agent/dist_1.1.x/src/main/scala/Main.scala b/src/sbt-test-0.13/agent/dist_1.1.x/src/main/scala/Main.scala
diff --git a/src/sbt-test-0.13/agent/dist_1.1.x/test b/src/sbt-test-0.13/agent/dist_1.1.x/test
diff --git a/src/sbt-test-0.13/agent/dist_1.1.x/test.sbt b/src/sbt-test-0.13/agent/dist_1.1.x/test.sbt
@@ -4,6 +4,7 @@ TaskKey[Unit]("check") := {
     "dist mappings do not include 'maxwell/maxwell.jar'"
   )
 
+  import scala.sys.process._
   val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!
 
   assert(
diff --git a/src/sbt-test-0.13/agent/dist_1.2.x/build.sbt b/src/sbt-test-0.13/agent/dist_1.2.x/build.sbt
@@ -0,0 +1,3 @@
+lazy val agentDist = project in file(".") enablePlugins (JavaAgent, JavaAppPackaging)
+
+javaAgents += "sbt.javaagent.test" % "maxwell" % sys.props("project.version")
diff --git a/src/sbt-test-0.13/agent/dist_1.2.x/project/plugins.sbt b/src/sbt-test-0.13/agent/dist_1.2.x/project/plugins.sbt
diff --git a/src/sbt-test-0.13/agent/dist_1.2.x/src/main/scala/Main.scala b/src/sbt-test-0.13/agent/dist_1.2.x/src/main/scala/Main.scala
@@ -0,0 +1 @@
+object Main extends App
diff --git a/src/sbt-test-0.13/agent/dist_1.2.x/test b/src/sbt-test-0.13/agent/dist_1.2.x/test
@@ -0,0 +1,2 @@
+> stage
+> check
diff --git a/src/sbt-test-0.13/agent/dist_1.2.x/test.sbt b/src/sbt-test-0.13/agent/dist_1.2.x/test.sbt
@@ -0,0 +1,14 @@
+TaskKey[Unit]("check") := {
+  assert(
+    (mappings in Universal).value exists { case (file, path) => path == "maxwell/maxwell.jar" },
+    "dist mappings do not include 'maxwell/maxwell.jar'"
+  )
+
+  import scala.sys.process._
+  val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!
+
+  assert(
+    output contains "Agent 86",
+    "output does not include 'Agent 86'"
+  )
+}
diff --git a/src/sbt-test/agent/arguments/test.sbt b/src/sbt-test/agent/arguments/test.sbt
@@ -19,6 +19,7 @@ TaskKey[Unit]("check") := {
     "dist mappings do not include 'maxwell/maxwell.jar'"
   )
 
+  import scala.sys.process._
   val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!
 
   assert(
diff --git a/src/sbt-test/agent/compile/test b/src/sbt-test/agent/compile/test
@@ -1,7 +1,7 @@
-> check-dependency
+> checkDependency
 > compile
 > run
-> check-log
+> checkLog
 > stage
-> check-dist
-> check-test-and-run-paths
+> checkDist
+> checkTestAndRunPaths
diff --git a/src/sbt-test/agent/compile/test.sbt b/src/sbt-test/agent/compile/test.sbt
@@ -1,4 +1,4 @@
-TaskKey[Unit]("check-dependency") := {
+TaskKey[Unit]("checkDependency") := {
   assert(
     libraryDependencies.value contains ("sbt.javaagent.test" % "maxwell" % sys.props("project.version") % "provided"),
     "maxwell test agent is not in libraryDependencies under 'provided'"
@@ -8,19 +8,20 @@ TaskKey[Unit]("check-dependency") := {
 def expect(name: String, contents: String, expected: String): Unit =
   assert(contents contains expected, s"$name should contain '$expected'")
 
-TaskKey[Unit]("check-log") := {
+TaskKey[Unit]("checkLog") := {
   val log = IO.read(BuiltinCommands.lastLogFile(state.value).get)
   expect("run log", log, "Agent 86")
   expect("run log", log, "class maxwell.Maxwell")
 }
 
-TaskKey[Unit]("check-dist") := {
+TaskKey[Unit]("checkDist") := {
+  import scala.sys.process._
   val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!
   expect("dist run", output, "Agent 86")
   expect("dist run", output, "class maxwell.Maxwell")
 }
 
-TaskKey[Unit]("check-test-and-run-paths") := {
+TaskKey[Unit]("checkTestAndRunPaths") := {
   assert(
     !((dependencyClasspath in Runtime).value exists (f => f.data.name.contains("maxwell"))),
     "maxwell test agent is available on the runtime class path"
diff --git a/src/sbt-test/agent/confs/build.sbt b/src/sbt-test/agent/confs/build.sbt
@@ -9,7 +9,12 @@ libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
 testGrouping in Test := {
   (testGrouping in Test).value map {
     case group @ Tests.Group(_, _, Tests.SubProcess(forkOptions)) =>
-      group.copy(runPolicy = Tests.SubProcess(forkOptions.copy(outputStrategy = Some(LoggedOutput(streams.value.log)))))
+      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)
+}
diff --git a/src/sbt-test/agent/confs/test b/src/sbt-test/agent/confs/test
@@ -1,5 +1,5 @@
 > run
-> check-log
-> clear-log
+> checkLog
+> clearLog
 > test
-> check-log
+> checkLog
diff --git a/src/sbt-test/agent/confs/test.sbt b/src/sbt-test/agent/confs/test.sbt
@@ -1,4 +1,4 @@
-TaskKey[Unit]("check-log") := {
+TaskKey[Unit]("checkLog") := {
   val log = IO.read(BuiltinCommands.lastLogFile(state.value).get)
 
   def expect(expected: String): Unit = {
@@ -9,6 +9,6 @@ TaskKey[Unit]("check-log") := {
   expect("class maxwell.Maxwell")
 }
 
-TaskKey[Unit]("clear-log") := {
+TaskKey[Unit]("clearLog") := {
   IO.write(BuiltinCommands.lastLogFile(state.value).get, "")
 }
diff --git a/src/sbt-test/agent/dist/test.sbt b/src/sbt-test/agent/dist/test.sbt
@@ -4,6 +4,7 @@ TaskKey[Unit]("check") := {
     "dist mappings do not include 'maxwell/maxwell.jar'"
   )
 
+  import scala.sys.process._
   val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!
 
   assert(
diff --git a/src/sbt-test/agent/named/test.sbt b/src/sbt-test/agent/named/test.sbt
@@ -4,6 +4,7 @@ TaskKey[Unit]("check") := {
     "dist mappings do not include 'get-smart/maxwell.jar'"
   )
 
+  import scala.sys.process._
   val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!
 
   assert(
diff --git a/src/sbt-test/agent/provided/test.sbt b/src/sbt-test/agent/provided/test.sbt
@@ -7,6 +7,7 @@ TaskKey[Unit]("check") := {
   expect("run log", lastLog, "Agent 86")
   expect("run log", lastLog, "class maxwell.Maxwell")
 
+  import scala.sys.process._
   val output = ((stagingDirectory in Universal).value / "bin" / packageName.value).absolutePath.!!
 
   expect("dist run", output, "Agent 86")
diff --git a/src/sbt-test/agent/test/build.sbt b/src/sbt-test/agent/test/build.sbt
@@ -9,7 +9,12 @@ libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
 testGrouping in Test := {
   (testGrouping in Test).value map {
     case group @ Tests.Group(_, _, Tests.SubProcess(forkOptions)) =>
-      group.copy(runPolicy = Tests.SubProcess(forkOptions.copy(outputStrategy = Some(LoggedOutput(streams.value.log)))))
+      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)
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright 2016 Lightbend Inc. [https://www.lightbend.com]`
	`1`	`+Copyright 2016-2017 Lightbend Inc. [https://www.lightbend.com]`
`2`	`2`
`3`	`3`	`Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=0.13.11`
	`1`	`+sbt.version=0.13.16`