.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/test.yml

@@ -22,15 +22,15 @@ jobs:
     name: Code format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: scalafmt test
         run: ./sbt scalafmtCheckAll
   test_sbt_plugin:
     name: plugin test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: actions/checkout@v3
+      - uses: olafurpg/setup-scala@v13
         with:
           java-version: adopt@1.11
       - name: scripted tests

.gitignore

@@ -10,6 +10,7 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+.bsp
 
 # Scala-IDE specific
 .scala_dependencies

.scalafmt.conf

@@ -1,4 +1,6 @@
-version = 2.7.5
+version = 3.6.0
+project.layout = StandardConvention
+runner.dialect = scala212
 maxColumn = 120
 style = defaultWithAlign
 optIn.breaksInsideChains = true

ReleaseNotes.md

@@ -1,5 +1,14 @@
 ### Release Notes
 
+## 0.15
+  - Update dependencies to use scala-xml 2.x
+
+## 0.14
+  - packArchiveStem := "" setting can be used for creating package for AWS Lambda
+  - Add packEnvVars setting for setting environment variables
+  - Improved packaging performance by removing redundant jar file copies
+  - Add packJarListFile setting to dump the list of written files
+
 ## 0.13
   - Fixed the packZipArchive perfmission issue https://github.com/xerial/sbt-pack/pull/204
   - Drop the support for sbt 0.13.x 

build.sbt

@@ -3,23 +3,23 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 enablePlugins(SbtTwirl)
 enablePlugins(SbtPlugin)
 
-organization := "org.xerial.sbt"
-organizationName := "Xerial project"
-name := "sbt-pack"
+organization         := "org.xerial.sbt"
+organizationName     := "Xerial project"
+name                 := "sbt-pack"
 organizationHomepage := Some(new URL("http://xerial.org/"))
-description := "A sbt plugin for packaging distributable Scala code"
+description          := "A sbt plugin for packaging distributable Scala code"
 
-publishMavenStyle := true
-publishArtifact in Test := false
+publishMavenStyle       := true
+Test / publishArtifact  := false
 
 pomIncludeRepository := { _ =>
   false
 }
 
-ThisBuild / scalaVersion := "2.12.14"
+ThisBuild / scalaVersion := "2.12.17"
 
 parallelExecution := true
-crossPaths := false
+crossPaths        := false
 scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked")
 
 scriptedBufferLog := false
@@ -33,9 +33,8 @@ scriptedLaunchOpts ++= {
 }
 
 libraryDependencies ++= Seq(
-  "org.slf4j"            % "slf4j-simple"     % "1.7.30",
-  "org.apache.commons"   % "commons-compress" % "1.20",
-  "org.scalatra.scalate" %% "scalate-core"    % "1.9.6",
-  "org.tukaani"          % "xz"               % "1.9",
-  "org.specs2"           %% "specs2-core"     % "4.8.2" % "test"
+  "org.slf4j"             % "slf4j-api"        % "1.7.36",
+  "org.apache.commons"    % "commons-compress" % "1.21",
+  "org.tukaani"           % "xz"               % "1.9",
+  "org.specs2"           %% "specs2-core"      % "4.17.0" % "test"
 )

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.7.3

project/plugins.sbt

@@ -1,9 +1,10 @@
-addSbtPlugin("com.github.sbt"      % "sbt-pgp"      % "2.1.2")
-addSbtPlugin("org.xerial.sbt"    % "sbt-sonatype" % "3.9.7")
-addSbtPlugin("org.scalameta"     % "sbt-scalafmt" % "2.3.3")
-addSbtPlugin("com.typesafe.sbt"  % "sbt-twirl"    % "1.5.1")
-addSbtPlugin("com.dwijnand"      % "sbt-dynver"   % "4.1.1")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
+ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
 
+addSbtPlugin("com.github.sbt"   % "sbt-pgp"      % "2.1.2")
+addSbtPlugin("org.xerial.sbt"   % "sbt-sonatype" % "3.9.13")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt" % "2.3.4")
+addSbtPlugin("com.typesafe.play" % "sbt-twirl"    % "1.6.0-M7")
+addSbtPlugin("com.dwijnand"     % "sbt-dynver"   % "4.1.1")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt" % "2.4.6")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

sbt

@@ -34,11 +34,11 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="1.5.4"
-declare -r sbt_unreleased_version="1.5.4"
+declare -r sbt_release_version="1.7.3"
+declare -r sbt_unreleased_version="1.7.3"
 
-declare -r latest_213="2.13.6"
-declare -r latest_212="2.12.14"
+declare -r latest_213="2.13.10"
+declare -r latest_212="2.12.17"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
 declare -r latest_29="2.9.3"
@@ -216,7 +216,8 @@ getJavaVersion() {
   # but on 9 and 10 it's 9.x.y and 10.x.y.
   if [[ "$str" =~ ^1\.([0-9]+)(\..*)?$ ]]; then
     echo "${BASH_REMATCH[1]}"
-  elif [[ "$str" =~ ^([0-9]+)(\..*)?$ ]]; then
+  # Fixes https://github.com/dwijnand/sbt-extras/issues/326
+  elif [[ "$str" =~ ^([0-9]+)(\..*)?(-ea)?$ ]]; then
     echo "${BASH_REMATCH[1]}"
   elif [[ -n "$str" ]]; then
     echoerr "Can't parse java version from: $str"
@@ -252,7 +253,9 @@ is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]]
 # MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
 default_jvm_opts() {
   local -r v="$(java_version)"
-  if [[ $v -ge 10 ]]; then
+  if [[ $v -ge 17 ]]; then
+    echo "$default_jvm_opts_common"
+  elif [[ $v -ge 10 ]]; then
     if is_apple_silicon; then
       # As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI
       echo "$default_jvm_opts_common"

sonatype.sbt

@@ -1,13 +1,13 @@
 import xerial.sbt.Sonatype._
 
-publishMavenStyle := true
-sonatypeProfileName := "org.xerial"
-sonatypeProjectHosting := Some(GitHubHosting(user="xerial", repository="sbt-pack", email="leo@xerial.org"))
+publishMavenStyle      := true
+sonatypeProfileName    := "org.xerial"
+sonatypeProjectHosting := Some(GitHubHosting(user = "xerial", repository = "sbt-pack", email = "leo@xerial.org"))
 developers := List(
   Developer(id = "leo", name = "Taro L. Saito", email = "leo@xerial.org", url = url("http://xerial.org/leo"))
 )
 licenses := Seq("APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 
 publishTo := sonatypePublishToBundle.value
 
-dynverSonatypeSnapshots in ThisBuild := true
+ThisBuild / dynverSonatypeSnapshots := true

src/main/scala/xerial/sbt/pack/PackArchive.scala

@@ -79,10 +79,10 @@ trait PackArchive {
   }
 
   lazy val packArchiveSettings = Seq[Def.Setting[_]](
-    packArchivePrefix := name.value,
-    packArchiveName := s"${packArchivePrefix.value}-${version.value}",
-    packArchiveStem := s"${packArchiveName.value}",
-    packArchiveExcludes := Seq.empty,
+    packArchivePrefix      := name.value,
+    packArchiveName        := s"${packArchivePrefix.value}-${version.value}",
+    packArchiveStem        := s"${packArchiveName.value}",
+    packArchiveExcludes    := Seq.empty,
     packArchiveTgzArtifact := Artifact(packArchivePrefix.value, "arch", "tar.gz"),
     packArchiveTbzArtifact := Artifact(packArchivePrefix.value, "arch", "tar.bz2"),
     packArchiveTxzArtifact := Artifact(packArchivePrefix.value, "arch", "tar.xz"),
@@ -103,7 +103,7 @@ trait PackArchive {
       createTarEntry
     ).value,
     packArchiveZip := createArchive("zip", new ZipArchiveOutputStream(_), createZipEntry).value,
-    packArchive := Seq(packArchiveTgz.value, packArchiveZip.value)
+    packArchive    := Seq(packArchiveTgz.value, packArchiveZip.value)
   )
 
   def publishPackArchiveTgz: SettingsDefinition = Seq(

src/main/scala/xerial/sbt/pack/PackPlugin.scala

@@ -22,7 +22,8 @@ import scala.util.matching.Regex
 
 /** Plugin for packaging projects
   *
-  * @author Taro L. Saito
+  * @author
+  *   Taro L. Saito
   */
 object PackPlugin extends AutoPlugin with PackArchive {
 
@@ -53,13 +54,13 @@ object PackPlugin extends AutoPlugin with PackArchive {
     val packTargetDir = settingKey[File]("target directory to pack default is target")
     val packDir       = settingKey[String]("pack directory name")
 
-    //val packBashTemplate = settingKey[String]("template file for bash scripts - defaults to pack's out-of-the-box template for bash")
-    //val packBatTemplate  = settingKey[String]("template file for bash scripts - defaults to pack's out-of-the-box template for bat")
-    //val packMakeTemplate = settingKey[String]("template file for bash scripts - defaults to pack's out-of-the-box template for make")
+    // val packBashTemplate = settingKey[String]("template file for bash scripts - defaults to pack's out-of-the-box template for bash")
+    // val packBatTemplate  = settingKey[String]("template file for bash scripts - defaults to pack's out-of-the-box template for bat")
+    // val packMakeTemplate = settingKey[String]("template file for bash scripts - defaults to pack's out-of-the-box template for make")
 
     val packMain           = taskKey[Map[String, String]]("prog_name -> main class table")
     val packMainDiscovered = taskKey[Map[String, String]]("discovered prog_name -> main class table")
-    val packExclude        = settingKey[Seq[String]]("specify projects whose dependencies will be excluded when packaging")
+    val packExclude = settingKey[Seq[String]]("specify projects whose dependencies will be excluded when packaging")
     val packExcludeLibJars =
       settingKey[Seq[String]]("specify projects to exclude when packaging.  Its dependencies will be processed")
     val packExcludeJars = settingKey[Seq[String]]("specify jar file name patterns to exclude when packaging")
@@ -81,10 +82,10 @@ object PackPlugin extends AutoPlugin with PackArchive {
     val packJarNameConvention = settingKey[String](
       "default: (artifact name)-(version).jar; original: original JAR name; full: (organization).(artifact name)-(version).jar; no-version: (organization).(artifact name).jar"
     )
-    val packDuplicateJarStrategy   = settingKey[String]("""deal with duplicate jars. default to use latest version
+    val packDuplicateJarStrategy = settingKey[String]("""deal with duplicate jars. default to use latest version
         |latest: use the jar with a higher version; exit: exit the task with error""".stripMargin)
     val packCopyDependenciesTarget = settingKey[File]("target folder used by the <packCopyDependencies> task.")
-    val packCopyDependencies       = taskKey[Unit]("""just copies the dependencies to the <packCopyDependencies> folder.
+    val packCopyDependencies = taskKey[Unit]("""just copies the dependencies to the <packCopyDependencies> folder.
         		|Compared to the <pack> task, it doesn't try to create scripts.
       	  """.stripMargin)
     val packCopyDependenciesUseSymbolicLinks =
@@ -122,25 +123,25 @@ object PackPlugin extends AutoPlugin with PackArchive {
 
   lazy val packSettings = Seq[Def.Setting[_]](
     packTargetDir := target.value,
-    packDir := "pack",
-    //packBashTemplate := "/xerial/sbt/template/launch.mustache",
-    //packBatTemplate := "/xerial/sbt/template/launch-bat.mustache",
-    //packMakeTemplate := "/xerial/sbt/template/Makefile.mustache",
-    packMain := packMainDiscovered.value,
-    packExclude := Seq.empty,
-    packExcludeLibJars := Seq.empty,
-    packExcludeJars := Seq.empty,
-    packJarListFile := None,
-    packExcludeArtifactTypes := Seq("source", "javadoc", "test"),
-    packMacIconFile := "icon-mac.png",
-    packResourceDir := Map(baseDirectory.value / "src/pack" -> ""),
-    packJvmOpts := Map.empty,
-    packExtraClasspath := Map.empty,
-    packExpandedClasspath := false,
-    packJarNameConvention := "default",
-    packDuplicateJarStrategy := "latest",
+    packDir       := "pack",
+    // packBashTemplate := "/xerial/sbt/template/launch.mustache",
+    // packBatTemplate := "/xerial/sbt/template/launch-bat.mustache",
+    // packMakeTemplate := "/xerial/sbt/template/Makefile.mustache",
+    packMain                   := packMainDiscovered.value,
+    packExclude                := Seq.empty,
+    packExcludeLibJars         := Seq.empty,
+    packExcludeJars            := Seq.empty,
+    packJarListFile            := None,
+    packExcludeArtifactTypes   := Seq("source", "javadoc", "test"),
+    packMacIconFile            := "icon-mac.png",
+    packResourceDir            := Map(baseDirectory.value / "src/pack" -> ""),
+    packJvmOpts                := Map.empty,
+    packExtraClasspath         := Map.empty,
+    packExpandedClasspath      := false,
+    packJarNameConvention      := "default",
+    packDuplicateJarStrategy   := "latest",
     packGenerateWindowsBatFile := true,
-    packGenerateMakefile := true,
+    packGenerateMakefile       := true,
     packMainDiscovered := Def.taskDyn {
       val mainClasses =
         getFromSelectedProjects(thisProjectRef.value, discoveredMainClasses in Compile, state.value, packExclude.value)
@@ -170,7 +171,7 @@ object PackPlugin extends AutoPlugin with PackArchive {
         toExclude
       }
 
-      val df = configurationFilter(name = "runtime") //&&
+      val df = configurationFilter(name = "runtime") // &&
 
       val dependentJars =
         for {
@@ -204,7 +205,7 @@ object PackPlugin extends AutoPlugin with PackArchive {
       distinctDpJars.toSeq.distinct.sortBy(_.noVersionModuleName)
     },
     packCopyDependenciesUseSymbolicLinks := true,
-    packCopyDependenciesTarget := target.value / "lib",
+    packCopyDependenciesTarget           := target.value / "lib",
     packCopyDependencies := {
       val log = streams.value.log
 

src/main/scala/xerial/sbt/pack/VersionString.scala

@@ -10,7 +10,8 @@ package xerial.sbt.pack
 import scala.util.{Success, Try}
 
 /** Class to represent version strings
-  * @author Christian Hoffmeister
+  * @author
+  *   Christian Hoffmeister
   */
 case class VersionString(numbers: List[String], suffix: Option[String]) {
   def major = numbers.head

src/sbt-test/sbt-pack/archive-modules/build.sbt

@@ -2,50 +2,50 @@ import xerial.sbt.pack.PackPlugin._
 // publish tar.gz archive to the repository (since sbt-pack-0.3.6)
 
 val commonSettings = Defaults.coreDefaultSettings ++
-        Seq(
-          scalaVersion := "2.12.14",
-          version := "0.1",
-          crossPaths := false
-        )
+  Seq(
+    scalaVersion := "2.12.17",
+    version      := "0.1",
+    crossPaths   := false
+  )
 
 lazy val root =
   Project(
     id = "archive-modules",
     base = file(".")
   ).enablePlugins(PackPlugin)
-          .settings(commonSettings)
-          .settings(publishPackArchives)
-          .aggregate(module1, module2) // dependency of module2 should not be included
-          .dependsOn(module1)
+    .settings(commonSettings)
+    .settings(publishPackArchives)
+    .aggregate(module1, module2) // dependency of module2 should not be included
+    .dependsOn(module1)
 
 lazy val module1 = Project(
   id = "module1",
   base = file("module1")
 ).enablePlugins(PackPlugin)
-        .settings(commonSettings)
-        .settings(publishPackArchives)
-        .settings(
-          libraryDependencies += "org.xerial" % "xerial-core" % "3.3.6"
-        )
+  .settings(commonSettings)
+  .settings(publishPackArchives)
+  .settings(
+    libraryDependencies += "org.xerial" % "xerial-core" % "3.3.6"
+  )
 
 lazy val module2 = Project(
   id = "module2",
   base = file("module2")
 ).enablePlugins(PackPlugin)
-        .settings(commonSettings)
-        .settings(publishPackArchives)
-        .settings(
-          libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.1.6"
-        )
+  .settings(commonSettings)
+  .settings(publishPackArchives)
+  .settings(
+    libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.1.6"
+  )
 
 // Empty archive stem test
 lazy val module3 = Project(
   id = "module3",
   base = file("module3")
 ).enablePlugins(PackPlugin)
-        .settings(commonSettings)
-        .settings(publishPackArchives)
-        .settings(
-          libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.1.6",
-          packArchiveStem := ""
-        )
+  .settings(commonSettings)
+  .settings(publishPackArchives)
+  .settings(
+    libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.1.6",
+    packArchiveStem                           := ""
+  )