Skip to content

Revert #3059: which generates non-bootstrapped for bootstrapped #3124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2017
Merged

Revert #3059: which generates non-bootstrapped for bootstrapped #3124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")