Skip to content

Bump sbt-pack version #3835

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 2 commits into from
Jan 15, 2018
Merged

Bump sbt-pack version #3835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c06e4aa
Bump sbt-pack version
allanrenucci Jan 11, 2018
9efb7c1
Update docker image
allanrenucci Jan 15, 2018
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
16 changes: 9 additions & 7 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

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.8.2")
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.10.1")

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