Merge pull request #3835 from dotty-staging/sbt-pack

Bump sbt-pack version

Author: allanrenucci

.drone.yml

@@ -15,37 +15,37 @@ pipeline:
   # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
   test_legacy:
     group: test
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     commands:
       - cp -R . /tmp/0/ && cd /tmp/0/
       - ./project/scripts/sbt legacyTests
 
   test:
     group: test
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     commands:
       - cp -R . /tmp/1/ && cd /tmp/1/
       - ./project/scripts/sbt ";compile ;test"
       - ./project/scripts/sbtTests
 
   test_bootstrapped:
     group: test
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     commands:
       - cp -R . /tmp/2/ && cd /tmp/2/
       - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
       - ./project/scripts/sbtBootstrappedTests
 
   test_optimised:
     group: test
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     commands:
       - cp -R . /tmp/3/ && cd /tmp/3/
       - ./project/scripts/sbt dotty-optimised/test
 
   test_sbt:
     group: test
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     commands:
       - cp -R . /tmp/4/ && cd /tmp/4/
       - ./project/scripts/sbt sbt-dotty/scripted
@@ -55,7 +55,7 @@ pipeline:
 
   # DOCUMENTATION:
   documentation:
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     commands:
       - ./project/scripts/genDocs
     secrets: [ bot_pass ]
@@ -67,7 +67,7 @@ pipeline:
   # PUBLISHING:
   # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
   publish_nightly:
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     environment:
       - NIGHTLYBUILD=yes
     commands:
@@ -78,7 +78,7 @@ pipeline:
       environment: nightly
 
   publish_release:
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     environment:
       - RELEASEBUILD=yes
     commands:
@@ -102,7 +102,7 @@ pipeline:
       event: tag
 
   publish_sbt_release:
-    image: lampepfl/dotty:2017-11-17
+    image: lampepfl/dotty:2018-01-15
     environment:
       - RELEASEBUILD=yes
     commands:

project/Build.scala

@@ -8,7 +8,9 @@ import java.util.Calendar
 
 import scala.reflect.io.Path
 import sbtassembly.AssemblyKeys.assembly
-import xerial.sbt.Pack._
+
+import xerial.sbt.pack.PackPlugin
+import xerial.sbt.pack.PackPlugin.autoImport._
 
 import sbt.Package.ManifestAttributes
 
@@ -1121,9 +1123,10 @@ object Build {
     ))
   }
 
-  lazy val commonDistSettings = packSettings ++ Seq(
+  lazy val commonDistSettings = Seq(
     packMain := Map(),
     publishArtifact := false,
+    packGenerateMakefile := false,
     packExpandedClasspath := true,
     packResourceDir += (baseDirectory.value / "bin" -> "bin"),
     packArchiveName := "dotty-" + dottyVersion
@@ -1171,11 +1174,10 @@ object Build {
       settings(commonBenchmarkSettings).
       enablePlugins(JmhPlugin)
 
-    def asDist(implicit mode: Mode): Project = project.withCommonSettings.
-      dependsOn(`dotty-interfaces`).
-      dependsOn(dottyCompiler).
-      dependsOn(dottyLibrary).
-      dependsOn(dottyDoc).
+    def asDist(implicit mode: Mode): Project = project.
+      enablePlugins(PackPlugin).
+      withCommonSettings.
+      dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, dottyDoc).
       settings(commonDistSettings).
       bootstrappedSettings(target := baseDirectory.value / "target") // override setting in commonBootstrappedSettings
 

project/plugins.sbt

@@ -13,7 +13,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.10.1")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.24")