Don't set default withAssemblyUnzipDirectory & use withAssemblyDirect…

…ory as fallback
sbt · Sep 22, 2021 · 4a48749 · 4a48749
1 parent 370c795
commit 4a48749
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/main/scala/sbtassembly/Assembly.scala b/src/main/scala/sbtassembly/Assembly.scala
@@ -218,7 +218,7 @@ object Assembly {
   def assembleMappings(classpath: Classpath, dependencies: Classpath,
       ao: AssemblyOption, log: Logger): Vector[MappingSet] = {
     val assemblyDir = ao.assemblyDirectory.get
-    val assemblyUnzipDir = ao.assemblyUnzipDirectory.get
+    val assemblyUnzipDir = (ao.assemblyUnzipDirectory orElse ao.assemblyDirectory).get
 
     if (!ao.cacheOutput) IO.delete(assemblyDir)
     if (!ao.cacheUnzip) IO.delete(assemblyUnzipDir)

diff --git a/src/main/scala/sbtassembly/AssemblyPlugin.scala b/src/main/scala/sbtassembly/AssemblyPlugin.scala
@@ -112,7 +112,6 @@ object AssemblyPlugin extends sbt.AutoPlugin {
       val s = streams.value
       AssemblyOption()
         .withAssemblyDirectory(s.cacheDirectory / "assembly")
-        .withAssemblyUnzipDirectory(s.cacheDirectory / "assembly")
         .withIncludeBin((assembleArtifact in packageBin).value)
         .withIncludeScala((assembleArtifact in assemblyPackageScala).value)
         .withIncludeDependency((assembleArtifact in assemblyPackageDependency).value)