From 0de771ef26804e65409cece8283d056e54208a95 Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Thu, 14 Sep 2017 15:06:17 +0200 Subject: [PATCH] revert #3059: which generates non-bootstrapped for bootstrapped There's some bug with the latest version of the sbt-pack plugin. --- project/Build.scala | 4 +--- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index d2d4068947c5..4b960bc72a6a 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -8,8 +8,7 @@ import java.util.Calendar import scala.reflect.io.Path import sbtassembly.AssemblyKeys.assembly -import xerial.sbt.pack.PackPlugin._ -import autoImport._ +import xerial.sbt.Pack._ import sbt.Package.ManifestAttributes @@ -1128,7 +1127,6 @@ object Build { lazy val commonDistSettings = packSettings ++ Seq( packMain := Map(), publishArtifact := false, - packGenerateMakefile := false, packExpandedClasspath := true, packResourceDir += (baseDirectory.value / "bin" -> "bin"), packArchiveName := "dotty-" + dottyVersion diff --git a/project/plugins.sbt b/project/plugins.sbt index 0a7c99b64aea..6b24922932e3 100644 --- a/project/plugins.sbt +++ b/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.9.1") +addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.2") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.24")