xerial · Nov 16, 2023 · Nov 16, 2023 · Nov 16, 2023 · Dec 7, 2023 · Dec 15, 2023
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -23,6 +23,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.15
+version = 3.8.0
 project.layout = StandardConvention
 runner.dialect = scala212
 maxColumn = 120

diff --git a/README.md b/README.md
@@ -213,7 +213,7 @@ packMain := Map("myapp"->"org.yourdomain.MyApp")
 **Dockerfile**
 ```
 # Using JDK17 from Amazon Corretto
-FROM FROM amazoncorretto:17
+FROM amazoncorretto:17
 
 COPY target/pack /srv/myapp
 

diff --git a/build.sbt b/build.sbt
@@ -16,7 +16,7 @@ pomIncludeRepository := { _ =>
   false
 }
 
-ThisBuild / scalaVersion := "2.12.18"
+ThisBuild / scalaVersion := "2.12.19"
 
 parallelExecution := true
 crossPaths        := false
@@ -35,7 +35,9 @@ scriptedLaunchOpts ++= {
 testFrameworks += new TestFramework("wvlet.airspec.Framework")
 
 libraryDependencies ++= Seq(
-  "org.wvlet.airframe" %% "airspec"          % "23.11.3" % Test,
-  "org.apache.commons"  % "commons-compress" % "1.24.0",
-  "org.tukaani"         % "xz"               % "1.9"
+  "org.wvlet.airframe" %% "airspec"          % "24.2.3" % Test,
+  "org.apache.commons"  % "commons-compress" % "1.26.0",
+  // commons-codec is necessary for commons-compress
+  "commons-codec" % "commons-codec" % "1.16.1",
+  "org.tukaani"   % "xz"            % "1.9"
 )
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,9 @@
 ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
 
 addSbtPlugin("com.github.sbt"          % "sbt-pgp"      % "2.2.1")
-addSbtPlugin("org.xerial.sbt"          % "sbt-sonatype" % "3.9.21")
+addSbtPlugin("org.xerial.sbt"          % "sbt-sonatype" % "3.10.0")
 addSbtPlugin("org.scalameta"           % "sbt-scalafmt" % "2.3.4")
-addSbtPlugin("org.playframework.twirl" % "sbt-twirl"    % "2.0.1")
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl"    % "2.0.4")
 addSbtPlugin("com.github.sbt"          % "sbt-dynver"   % "5.0.1")
 addSbtPlugin("org.scalameta"           % "sbt-scalafmt" % "2.5.2")
 

diff --git a/src/main/scala/xerial/sbt/pack/PackArchive.scala b/src/main/scala/xerial/sbt/pack/PackArchive.scala
@@ -1,25 +1,24 @@
 package xerial.sbt.pack
 
-import java.io._
-
-import org.apache.commons.compress.archivers._
-import org.apache.commons.compress.archivers.tar._
-import org.apache.commons.compress.archivers.zip._
+import java.io.*
+import org.apache.commons.compress.archivers.*
+import org.apache.commons.compress.archivers.tar.*
+import org.apache.commons.compress.archivers.zip.*
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream
-import org.apache.commons.compress.utils.IOUtils
-import sbt.Keys._
-import sbt._
+import org.apache.commons.io.IOUtils
+import sbt.Keys.*
+import sbt.*
 
 trait PackArchive {
 
   import PackPlugin.autoImport._
 
-  private def createArchive(
+  private def createArchive[EntryType <: ArchiveEntry](
       archiveSuffix: String,
-      createOutputStream: (OutputStream) => ArchiveOutputStream,
-      createEntry: (File, String, File) => ArchiveEntry
+      createOutputStream: (OutputStream) => ArchiveOutputStream[EntryType],
+      createEntry: (File, String, File) => EntryType
   ) = Def.task {
     val out                    = streams.value
     val targetDir: File        = packTargetDir.value
@@ -56,21 +55,22 @@ trait PackArchive {
     targetDir / archiveName
   }
 
-  private def createTarEntry(file: File, fileName: String, binDir: File) = {
+  private def createTarEntry(file: File, fileName: String, binDir: File): TarArchiveEntry = {
     val archiveEntry = new TarArchiveEntry(file, fileName)
-    if (file.getAbsolutePath startsWith binDir.getAbsolutePath)
+    if (file.getAbsolutePath startsWith binDir.getAbsolutePath) {
       archiveEntry.setMode(Integer.parseInt("0755", 8))
+    }
     archiveEntry
   }
 
-  private def createTarArchiveOutputStream(os: OutputStream) = {
+  private def createTarArchiveOutputStream(os: OutputStream): TarArchiveOutputStream = {
     val tos = new TarArchiveOutputStream(os)
     tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX)
     tos.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX)
     tos
   }
 
-  private def createZipEntry(file: File, fileName: String, binDir: File) = {
+  private def createZipEntry(file: File, fileName: String, binDir: File): ZipArchiveEntry = {
     val archiveEntry = new ZipArchiveEntry(file, fileName)
     if (file.getAbsolutePath.startsWith(binDir.getAbsolutePath)) {
       archiveEntry.setUnixMode(Integer.parseInt("0755", 8))
@@ -88,28 +88,30 @@ trait PackArchive {
     packArchiveTxzArtifact := Artifact(packArchivePrefix.value, "arch", "tar.xz"),
     packArchiveZipArtifact := Artifact(packArchivePrefix.value, "arch", "zip"),
     Def.derive(
-      packArchiveTgz := createArchive(
+      packArchiveTgz := createArchive[TarArchiveEntry](
         "tar.gz",
         (fos) => createTarArchiveOutputStream(new GzipCompressorOutputStream(fos)),
         createTarEntry
       ).value
     ),
     Def.derive(
-      packArchiveTbz := createArchive(
+      packArchiveTbz := createArchive[TarArchiveEntry](
         "tar.bz2",
         (fos) => createTarArchiveOutputStream(new BZip2CompressorOutputStream(fos)),
         createTarEntry
       ).value
     ),
     Def.derive(
-      packArchiveTxz := createArchive(
+      packArchiveTxz := createArchive[TarArchiveEntry](
         "tar.xz",
         (fos) => createTarArchiveOutputStream(new XZCompressorOutputStream(fos)),
         createTarEntry
       ).value
     ),
-    Def.derive(packArchiveZip := createArchive("zip", new ZipArchiveOutputStream(_), createZipEntry).value),
-    Def.derive(packArchive    := Seq(packArchiveTgz.value, packArchiveZip.value))
+    Def.derive(
+      packArchiveZip := createArchive[ZipArchiveEntry]("zip", new ZipArchiveOutputStream(_), createZipEntry).value
+    ),
+    Def.derive(packArchive := Seq(packArchiveTgz.value, packArchiveZip.value))
   )
 
   def publishPackArchiveTgz: SettingsDefinition =

diff --git a/src/main/scala/xerial/sbt/pack/PackPlugin.scala b/src/main/scala/xerial/sbt/pack/PackPlugin.scala
@@ -144,14 +144,14 @@ object PackPlugin extends AutoPlugin with PackArchive {
     packGenerateMakefile       := true,
     packMainDiscovered := Def.taskDyn {
       val mainClasses =
-        getFromSelectedProjects(thisProjectRef.value, discoveredMainClasses in Compile, state.value, packExclude.value)
+        getFromSelectedProjects(thisProjectRef.value, Compile / discoveredMainClasses, state.value, packExclude.value)
       Def.task {
         mainClasses.value.flatMap(_._1.map(mainClass => hyphenize(mainClass.split('.').last) -> mainClass).toMap).toMap
       }
     }.value,
     packAllUnmanagedJars := Def.taskDyn {
       val allUnmanagedJars =
-        getFromSelectedProjects(thisProjectRef.value, unmanagedJars in Runtime, state.value, packExclude.value)
+        getFromSelectedProjects(thisProjectRef.value, Runtime / unmanagedJars, state.value, packExclude.value)
       Def.task { allUnmanagedJars.value }
     }.value,
     Def.derive(
@@ -513,7 +513,7 @@ object PackPlugin extends AutoPlugin with PackArchive {
       (currentProject +: (children flatMap transitiveDependencies)) filterNot (isExcluded)
     }
     val projects: Seq[ProjectRef] = transitiveDependencies(contextProject).distinct
-    projects.map(p => (Def.task { ((targetTask in p).value, p) }) evaluate structure.data).join
+    projects.map(p => (Def.task { ((p / targetTask).value, p) }) evaluate structure.data).join
   }
 
   private val humanReadableTimestampFormatter = new DateTimeFormatterBuilder()

diff --git a/src/sbt-test/sbt-pack/archive-modules/build.sbt b/src/sbt-test/sbt-pack/archive-modules/build.sbt
@@ -3,7 +3,7 @@ import xerial.sbt.pack.PackPlugin._
 
 val commonSettings = Defaults.coreDefaultSettings ++
   Seq(
-    scalaVersion := "2.12.18",
+    scalaVersion := "2.12.19",
     version      := "0.1",
     crossPaths   := false
   )

diff --git a/src/sbt-test/sbt-pack/build-sbt/build.sbt b/src/sbt-test/sbt-pack/build-sbt/build.sbt
@@ -1,5 +1,5 @@
 enablePlugins(PackPlugin)
 
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.19"
 
 packExtraClasspath := Map("hello" -> Seq("${PROG_HOME}/extra"))
diff --git a/src/sbt-test/sbt-pack/convention-full/build.sbt b/src/sbt-test/sbt-pack/convention-full/build.sbt
@@ -1,6 +1,6 @@
 enablePlugins(PackPlugin)
 
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.19"
 
 libraryDependencies := Seq("org.xerial" % "xerial-core" % "3.3.6")
 

diff --git a/src/sbt-test/sbt-pack/convention-noversion/build.sbt b/src/sbt-test/sbt-pack/convention-noversion/build.sbt
@@ -1,6 +1,6 @@
 enablePlugins(PackPlugin)
 
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.19"
 
 libraryDependencies := Seq("org.xerial" % "xerial-core" % "3.3.6")
 

diff --git a/src/sbt-test/sbt-pack/copy-dependencies/build.sbt b/src/sbt-test/sbt-pack/copy-dependencies/build.sbt
@@ -1,7 +1,7 @@
-ThisBuild / scalaVersion := "2.12.18"
+ThisBuild / scalaVersion := "2.12.19"
 
 val commonSettings = Seq(
-  scalaVersion               := "2.12.18",
+  scalaVersion               := "2.12.19",
   version                    := "0.1",
   crossPaths                 := false,
   packCopyDependenciesTarget := target.value / "WEB-INF/lib"

diff --git a/src/sbt-test/sbt-pack/duplicate-jars/build.sbt b/src/sbt-test/sbt-pack/duplicate-jars/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.18"
+ThisBuild / scalaVersion := "2.12.19"
 val commonSettings = Defaults.coreDefaultSettings ++ Seq(
   version    := "0.1",
   crossPaths := false

diff --git a/src/sbt-test/sbt-pack/env-vars/build.sbt b/src/sbt-test/sbt-pack/env-vars/build.sbt
@@ -1,7 +1,7 @@
 enablePlugins(PackPlugin)
 name := "env-vars"
 
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.19"
 // custom settings here
 crossPaths := false
 

diff --git a/src/sbt-test/sbt-pack/exclude-jars/build.sbt b/src/sbt-test/sbt-pack/exclude-jars/build.sbt
@@ -1,6 +1,6 @@
 enablePlugins(PackPlugin)
 version      := "0.1"
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.19"
 crossPaths   := false
 name         := "exclude-jars"
 libraryDependencies ++= Seq(

diff --git a/src/sbt-test/sbt-pack/exclude-makefile/build.sbt b/src/sbt-test/sbt-pack/exclude-makefile/build.sbt
@@ -1,5 +1,5 @@
 enablePlugins(PackPlugin)
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.19"
 crossPaths   := false
 name         := "exclude-makefile"
 version      := "0.1"

diff --git a/src/sbt-test/sbt-pack/exclude-test-config/build.sbt b/src/sbt-test/sbt-pack/exclude-test-config/build.sbt
@@ -1,7 +1,7 @@
-ThisBuild / scalaVersion := "2.12.18"
+ThisBuild / scalaVersion := "2.12.19"
 
 val commonSettings = Seq(
-  scalaVersion := "2.12.18",
+  scalaVersion := "2.12.19",
   version      := "0.1",
   crossPaths   := false
 )

diff --git a/src/sbt-test/sbt-pack/min-project/build.sbt b/src/sbt-test/sbt-pack/min-project/build.sbt
@@ -1,6 +1,6 @@
 enablePlugins(PackPlugin)
 name := "min-project"
 
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.19"
 // custom settings here
 crossPaths := false
diff --git a/src/sbt-test/sbt-pack/multi-module/build.sbt b/src/sbt-test/sbt-pack/multi-module/build.sbt
@@ -1,5 +1,5 @@
 val commonSettings = Defaults.coreDefaultSettings ++ Seq(
-  scalaVersion := "2.12.18",
+  scalaVersion := "2.12.19",
   version      := "0.1",
   crossPaths   := false
 )

diff --git a/src/sbt-test/sbt-pack/nested-project/build.sbt b/src/sbt-test/sbt-pack/nested-project/build.sbt
@@ -2,7 +2,7 @@ name := "nested"
 
 ThisBuild / version := "0.1"
 
-ThisBuild / scalaVersion := "2.12.18"
+ThisBuild / scalaVersion := "2.12.19"
 
 enablePlugins(PackPlugin)
 

diff --git a/src/sbt-test/sbt-pack/pack-resources/build.sbt b/src/sbt-test/sbt-pack/pack-resources/build.sbt
@@ -3,7 +3,7 @@ lazy val root = Project(
   base = file(".")
 ).enablePlugins(PackPlugin)
   .settings(
-    scalaVersion := "2.12.18",
+    scalaVersion := "2.12.19",
     // Copy files from ${root}/web/... to ${root}/target/pack/web-content...
     packResourceDir += (baseDirectory.value / "web" -> "web-content"),
     // custom settings here

diff --git a/src/sbt-test/sbt-pack/space in path/build.sbt b/src/sbt-test/sbt-pack/space in path/build.sbt
@@ -1,3 +1,3 @@
 enablePlugins(PackPlugin)
 
-scalaVersion := "2.12.18"
+scalaVersion := "2.12.19"