Skip to content

Commit 59dca50

Browse files
timcharpermuuki88
authored andcommitted
fix packageZipTarball defaults for UniversalDocs and UniversalSource
Resurects #1018
1 parent ff5f5cb commit 59dca50

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/main/scala/com/typesafe/sbt/packager/universal/UniversalPlugin.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ object UniversalPlugin extends AutoPlugin {
8686
private[this] def defaultUniversalArchiveOptions: Seq[Setting[_]] = Seq(
8787
universalArchiveOptions in (Universal, packageZipTarball) := Seq("-pcvf"),
8888
universalArchiveOptions in (Universal, packageXzTarball) := Seq("-pcvf"),
89+
universalArchiveOptions in (UniversalDocs, packageZipTarball) := Seq("-pcvf"),
8990
universalArchiveOptions in (UniversalDocs, packageXzTarball) := Seq("-pcvf"),
90-
universalArchiveOptions in (UniversalDocs, packageXzTarball) := Seq("-pcvf"),
91-
universalArchiveOptions in (UniversalSrc, packageXzTarball) := Seq("-pcvf"),
91+
universalArchiveOptions in (UniversalSrc, packageZipTarball) := Seq("-pcvf"),
9292
universalArchiveOptions in (UniversalSrc, packageXzTarball) := Seq("-pcvf")
9393
)
9494

src/sbt-test/universal/test-zips/test

+8
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,18 @@ $ exists target/universal-src/simple-test-0.1.0.zip
99
# Run the tgz packaging.
1010
> universal:packageZipTarball
1111
$ exists target/universal/simple-test-0.1.0.tgz
12+
> universal-docs:packageZipTarball
13+
$ exists target/universal-docs/simple-test-0.1.0.tgz
14+
> universal-src:packageZipTarball
15+
$ exists target/universal-src/simple-test-0.1.0.tgz
1216

1317
# Run the txz packaging.
1418
> universal:packageXzTarball
1519
$ exists target/universal/simple-test-0.1.0.txz
20+
> universal-docs:packageXzTarball
21+
$ exists target/universal-docs/simple-test-0.1.0.txz
22+
> universal-src:packageXzTarball
23+
$ exists target/universal-src/simple-test-0.1.0.txz
1624

1725

1826
# TODO - Check contents of zips

0 commit comments

Comments
 (0)