Skip to content

Commit c06e4aa

Browse files
committed
Bump sbt-pack version
1 parent 576f6c6 commit c06e4aa

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

project/Build.scala

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

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

1315
import sbt.Package.ManifestAttributes
1416

@@ -1121,9 +1123,10 @@ object Build {
11211123
))
11221124
}
11231125

1124-
lazy val commonDistSettings = packSettings ++ Seq(
1126+
lazy val commonDistSettings = Seq(
11251127
packMain := Map(),
11261128
publishArtifact := false,
1129+
packGenerateMakefile := false,
11271130
packExpandedClasspath := true,
11281131
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
11291132
packArchiveName := "dotty-" + dottyVersion
@@ -1171,11 +1174,10 @@ object Build {
11711174
settings(commonBenchmarkSettings).
11721175
enablePlugins(JmhPlugin)
11731176

1174-
def asDist(implicit mode: Mode): Project = project.withCommonSettings.
1175-
dependsOn(`dotty-interfaces`).
1176-
dependsOn(dottyCompiler).
1177-
dependsOn(dottyLibrary).
1178-
dependsOn(dottyDoc).
1177+
def asDist(implicit mode: Mode): Project = project.
1178+
enablePlugins(PackPlugin).
1179+
withCommonSettings.
1180+
dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, dottyDoc).
11791181
settings(commonDistSettings).
11801182
bootstrappedSettings(target := baseDirectory.value / "target") // override setting in commonBootstrappedSettings
11811183

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

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

0 commit comments

Comments
 (0)