Skip to content

Commit 58ca93d

Browse files
Merge pull request #3124 from dotty-staging/revert-3059
Revert #3059: which generates non-bootstrapped for bootstrapped
2 parents 51388eb + 0de771e commit 58ca93d

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

project/Build.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import java.util.Calendar
88

99
import scala.reflect.io.Path
1010
import sbtassembly.AssemblyKeys.assembly
11-
import xerial.sbt.pack.PackPlugin._
12-
import autoImport._
11+
import xerial.sbt.Pack._
1312

1413
import sbt.Package.ManifestAttributes
1514

@@ -1128,7 +1127,6 @@ object Build {
11281127
lazy val commonDistSettings = packSettings ++ Seq(
11291128
packMain := Map(),
11301129
publishArtifact := false,
1131-
packGenerateMakefile := false,
11321130
packExpandedClasspath := true,
11331131
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
11341132
packArchiveName := "dotty-" + dottyVersion

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
1313

1414
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
1515

16-
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.9.1")
16+
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.2")
1717

1818
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.24")
1919

0 commit comments

Comments
 (0)