Cross build with sbt 1.0

.travis.yml

@@ -1,35 +1,46 @@
 language: java
-os:
-  - osx
-env:
-  - SCALA_VERSION=2.10.5
+os: linux
+
 before_install:
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then
       brew update;
       brew install xz;
     fi
-script:
-  - ./sbt ++$SCALA_VERSION --warn update compile test:compile
-  - ./sbt ++$SCALA_VERSION test "scripted universal/* jar/* bash/* ash/*"
-  - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
-      ./sbt ++$SCALA_VERSION "scripted rpm/* debian/* docker/staging docker/entrypoint docker/ports docker/volumes";
-    fi
-  - if [[ "$TRAVIS_JDK_VERSION" = "oraclejdk8" ]]; then
-      ./sbt ++$SCALA_VERSION "scripted jdkpackager/test-package-minimal jdkpackager/test-package-mappings";
-    fi
-notifications:
-  email:
-    - [email protected]
+script: ./sbt "$SBT_TEST_CMD";
+
+# We explicitly set the matrix to include oraclejdk8 because MacOS X has issues. See comment below
+matrix:
+  include:
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validate"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validateUniversal"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validateJar"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validateBash"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validateAsh"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validateRpm"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validateDebian"
+      # for now we can't test the docker image generation on travis
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validateDockerUnit"
+      # jdk packaging is only available on jdk8+
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="^validateJdkPackagerTravis"
+      # oraclejdk8 is not yet available.
+      # see https://github.com/travis-ci/travis-ci/issues/2316
+    - os: osx
+      env: SBT_VERSION_CMD="^validate ^validateUniversal"
+      osx_image: xcode8
+
 addons:
   apt:
     packages:
     - rpm
-matrix:
-  include:
-    - os: linux
-      jdk: openjdk7
-    - os: linux
-      jdk: oraclejdk8
 
 sudo: false
 cache:

build.sbt

@@ -3,19 +3,56 @@ sbtPlugin := true
 name := "sbt-native-packager"
 organization := "com.typesafe.sbt"
 
-scalaVersion in Global := "2.10.5"
-scalacOptions in Compile ++= Seq("-deprecation", "-target:jvm-1.7")
+scalaVersion in Global := "2.10.6"
 
+// crossBuildingSettings
+crossSbtVersions := Vector("0.13.16", "1.0.0-RC3")
+
+scalacOptions in Compile ++= Seq("-deprecation")
+javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
+
+// put jdeb on the classpath for scripted tests
+classpathTypes += "maven-plugin"
 libraryDependencies ++= Seq(
   "org.apache.commons" % "commons-compress" % "1.4.1",
   // for jdkpackager
   "org.apache.ant" % "ant" % "1.9.6",
-  // these dependencies have to be explicitly added by the user
-  "com.spotify" % "docker-client" % "3.5.13" % "provided",
-  "org.vafer" % "jdeb" % "1.3" % "provided" artifacts (Artifact("jdeb", "jar", "jar")),
   "org.scalatest" %% "scalatest" % "3.0.3" % "test"
 )
 
+// sbt dependend libraries
+libraryDependencies ++= {
+  (sbtVersion in pluginCrossBuild).value match {
+    case v if v.startsWith("1.") =>
+      Seq(
+        "org.scala-sbt" %% "io" % "1.0.0-M13",
+        // these dependencies have to be explicitly added by the user
+        // FIXME temporary remove the 'provided' scope. SBT 1.0.0-M6 changed the resolving somehow
+        "com.spotify" % "docker-client" % "3.5.13" /* % "provided" */,
+        "org.vafer" % "jdeb" % "1.3" /*% "provided"*/ artifacts Artifact("jdeb", "jar", "jar")
+      )
+    case _ =>
+      Seq(
+        // these dependencies have to be explicitly added by the user
+        "com.spotify" % "docker-client" % "3.5.13" % "provided",
+        "org.vafer" % "jdeb" % "1.3" % "provided" artifacts Artifact("jdeb", "jar", "jar")
+      )
+  }
+}
+
+// scala version depended libraries
+libraryDependencies ++= {
+  scalaBinaryVersion.value match {
+    case "2.10" => Nil
+    case _ =>
+      Seq(
+        "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.6",
+        "org.scala-lang.modules" %% "scala-xml" % "1.0.6"
+      )
+  }
+
+}
+
 // configure github page
 enablePlugins(SphinxPlugin, SiteScaladocPlugin)
 
@@ -34,12 +71,12 @@ import ReleaseTransformations._
 releaseProcess := Seq[ReleaseStep](
   checkSnapshotDependencies,
   inquireVersions,
-  runTest,
-  releaseStepInputTask(scripted, " universal/* debian/* rpm/* docker/* ash/* jar/* bash/* jdkpackager/*"),
+  releaseStepCommandAndRemaining("^ test"),
+  releaseStepCommandAndRemaining("^ scripted universal/* debian/* rpm/* docker/* ash/* jar/* bash/* jdkpackager/*"),
   setReleaseVersion,
   commitReleaseVersion,
   tagRelease,
-  publishArtifacts,
+  releaseStepCommandAndRemaining("^ publishSigned"),
   setNextVersion,
   commitNextVersion,
   pushChanges,
@@ -50,8 +87,29 @@ releaseProcess := Seq[ReleaseStep](
 bintrayOrganization := Some("sbt")
 bintrayRepository := "sbt-plugin-releases"
 
-// scalafmt
-scalafmtConfig := Some(file(".scalafmt.conf"))
-
 // ci commands
-addCommandAlias("validateWindows", ";test-only * -- -n windows;scripted universal/dist universal/stage windows/*")
+addCommandAlias("validateFormatting", "; scalafmt::test ; test:scalafmt::test ; sbt:scalafmt::test")
+addCommandAlias("validate", "; clean ; update ; test")
+
+// List all scripted test separately to schedule them in different travis-ci jobs.
+// Travis-CI has hard timeouts for jobs, so we run them in smaller jobs as the scripted
+// tests take quite some time to run.
+// Ultimatley we should run only those tests that are necessary for a change
+addCommandAlias("validateUniversal", "scripted universal/*")
+addCommandAlias("validateJar", "scripted jar/*")
+addCommandAlias("validateBash", "scripted bash/*")
+addCommandAlias("validateAsh", "scripted ash/*")
+addCommandAlias("validateRpm", "scripted rpm/*")
+addCommandAlias("validateDebian", "scripted debian/*")
+addCommandAlias("validateDocker", "scripted docker/*")
+addCommandAlias("validateDockerUnit", "scripted docker/staging docker/entrypoint docker/ports docker/volumes")
+addCommandAlias("validateJdkPackager", "scripted jdkpackager/*")
+// travis ci's jdk8 version doesn't support nested association elements.
+// error: Caused by: class com.sun.javafx.tools.ant.Info doesn't support the nested "association" element.
+addCommandAlias(
+  "validateJdkPackagerTravis",
+  "scripted jdkpackager/test-package-minimal jdkpackager/test-package-mappings"
+)
+
+// TODO check the cygwin scripted tests and run them on appveyor
+addCommandAlias("validateWindows", "; test-only * -- -n windows;scripted universal/dist universal/stage windows/*")

project/build.properties

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

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.0.0")
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
@@ -12,4 +12,4 @@ libraryDependencies += "jline" % "jline" % "2.11"
 addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
 
 // For code formatting
-addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.8")
+addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10")

src/main/scala-sbt-0.13/com/typesafe/sbt/packager/Compat.scala

@@ -0,0 +1,46 @@
+package com.typesafe.sbt.packager
+
+import sbt.{Artifact, BufferedLogger, FullLogger, Logger}
+
+import scala.sys.process.ProcessLogger
+
+object Compat {
+
+  /**
+    * Used in:
+    *
+    * - [[com.typesafe.sbt.packager.windows.WindowsPlugin]]
+    * - [[com.typesafe.sbt.packager.rpm.RpmHelper]]
+    * - [[com.typesafe.sbt.packager.docker.DockerPlugin]]
+    * - [[com.typesafe.sbt.packager.debian.DebianNativePackaging]]
+    * - [[com.typesafe.sbt.packager.rpm.RpmPlugin]]
+    *
+    * @param log
+    * @return turns a Logger into a ProcessLogger
+    */
+  implicit def log2ProcessLogger(log: Logger): sys.process.ProcessLogger =
+    new BufferedLogger(new FullLogger(log)) with sys.process.ProcessLogger {
+      def err(s: => String): Unit = error(s)
+      def out(s: => String): Unit = info(s)
+    }
+
+  /**
+    * Used in
+    *
+    * - [[com.typesafe.sbt.packager.docker.DockerPlugin]]
+    *
+    * @param logger The sbt.ProcessLogger that should be wrapped
+    * @return A scala ProcessLogger
+    */
+  implicit def sbtProcessLogger2ScalaProcessLogger(logger: sbt.ProcessLogger): sys.process.ProcessLogger =
+    ProcessLogger(msg => logger.info(msg), err => logger.error(err))
+
+  /**
+    * Use in the scripted `universal/multiproject-classifiers` test.
+    * @param artifact polyfill new methods
+    */
+  implicit class CompatArtifact(artifact: Artifact) {
+    def withClassifier(classifier: Option[String]): Artifact =
+      artifact.copy(classifier = classifier)
+  }
+}

src/main/scala/com/typesafe/sbt/packager/MappingsHelper.scala → src/main/scala-sbt-0.13/com/typesafe/sbt/packager/MappingsHelper.scala

@@ -1,8 +1,6 @@
-package com.typesafe.sbt
-package packager
+package com.typesafe.sbt.packager
 
 import sbt._
-import com.typesafe.sbt.packager.archetypes.JavaAppPackaging
 
 /** A set of helper methods to simplify the writing of mappings */
 object MappingsHelper {

src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala → src/main/scala-sbt-0.13/com/typesafe/sbt/packager/SettingsHelper.scala

@@ -1,8 +1,7 @@
-package com.typesafe.sbt
-package packager
+package com.typesafe.sbt.packager
 
-import sbt._
 import sbt.Keys._
+import sbt._
 
 object SettingsHelper {
 

src/main/scala-sbt-1.0/com/typesafe/sbt/packager/Compat.scala

@@ -0,0 +1,39 @@
+package com.typesafe.sbt.packager
+
+import sbt.{PathFinder, librarymanagement => lm}
+import sbt.internal.{librarymanagement => ilm, BuildDependencies => InternalBuildDependencies}
+import sbt.util.CacheStore
+
+object Compat {
+  val IvyActions = ilm.IvyActions
+  type IvySbt = ilm.IvySbt
+  type IvyScala = sbt.librarymanagement.ScalaModuleInfo
+  val IvyScala = sbt.librarymanagement.ScalaModuleInfo
+
+  type UpdateConfiguration = lm.UpdateConfiguration
+
+  /**
+    * Used in
+    * - [[com.typesafe.sbt.packager.archetypes.JavaAppPackaging]]
+    */
+  type BuildDependencies = InternalBuildDependencies
+
+  /**
+    *
+    */
+  type Process = sys.process.Process
+
+  /**
+    * Used in
+    * - [[com.typesafe.sbt.packager.docker.DockerPlugin]]
+    */
+  type ProcessLogger = sys.process.ProcessLogger
+
+  /**
+    *  Used in
+    * - [[com.typesafe.sbt.packager.Stager]]
+    * @param file
+    * @return a CacheStore
+    */
+  implicit def fileToCacheStore(file: java.io.File): CacheStore = CacheStore(file)
+}

src/main/scala-sbt-1.0/com/typesafe/sbt/packager/MappingsHelper.scala

@@ -0,0 +1,84 @@
+package com.typesafe.sbt.packager
+
+import sbt._
+import sbt.io._
+
+/** A set of helper methods to simplify the writing of mappings */
+object MappingsHelper extends Mapper {
+
+  /**
+    * It lightens the build file if one wants to give a string instead of file.
+    *
+    * @example
+    * {{{
+    * mappings in Universal ++= directory("extra")
+    * }}}
+    *
+    * @param sourceDir
+    * @return mappings
+    */
+  def directory(sourceDir: String): Seq[(File, String)] =
+    directory(file(sourceDir))
+
+  /**
+    * It lightens the build file if one wants to give a string instead of file.
+    *
+    * @example
+    * {{{
+    * mappings in Universal ++= sourceDir("extra")
+    * }}}
+    *
+    * @param sourceDir as string representation
+    * @return mappings
+    */
+  def contentOf(sourceDir: String): Seq[(File, String)] =
+    contentOf(file(sourceDir))
+
+  /**
+    * Create mappings from your classpath. For example if you want to add additional
+    * dependencies, like test or model.
+    *
+    *
+    * @example Add all test artifacts to a separated test folder
+    * {{{
+    * mappings in Universal ++= fromClasspath((managedClasspath in Test).value, target = "test")
+    * }}}
+    *
+    * @param entries
+    * @param target
+    * @return a list of mappings
+    */
+  def fromClasspath(entries: Seq[Attributed[File]], target: String): Seq[(File, String)] =
+    fromClasspath(entries, target, _ => true)
+
+  /**
+    * Create mappings from your classpath. For example if you want to add additional
+    * dependencies, like test or model. You can also filter the artifacts that should
+    * be mapped to mappings.
+    *
+    * @example Filter all osgi bundles
+    * {{{
+    * mappings in Universal ++= fromClasspath(
+    *    (managedClasspath in Runtime).value,
+    *    "osgi",
+    *    artifact => artifact.`type` == "bundle"
+    * )
+    * }}}
+    *
+    *
+    * @param entries from where mappings should be created from
+    * @param target folder, e.g. `model`. Must not end with a slash
+    * @param includeArtifact function to determine if an artifact should result in a mapping
+    * @param includeOnNoArtifact default is false. When there's no Artifact meta data remove it
+    */
+  def fromClasspath(entries: Seq[Attributed[File]],
+		    target: String,
+		    includeArtifact: Artifact => Boolean,
+		    includeOnNoArtifact: Boolean = false): Seq[(File, String)] =
+    entries.filter(attr => attr.get(sbt.Keys.artifact.key) map includeArtifact getOrElse includeOnNoArtifact).map {
+      attribute =>
+	val file = attribute.data
+	file -> s"$target/${file.getName}"
+    }
+
+}