.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.6.1
+8bc6d72c02004bacb63f930d1a6afdb7bcd6386d

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.6.0
+version = 3.6.1
 project.layout = StandardConvention
 runner.dialect = scala212
 maxColumn = 120

README.md

@@ -38,7 +38,7 @@ Add `sbt-pack` plugin to your sbt configuration:
 addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "(version)")  
 ```
 
-Repository URL: http://repo1.maven.org/maven2/org/xerial/sbt/
+Repository URL: https://repo1.maven.org/maven2/org/xerial/sbt/
 
 #### Minimum configuration
 
@@ -249,8 +249,7 @@ For releasing:
 
 ```
 $ ./sbt
-# cross tests for sbt 0.13 and 1.1
-> ^ scripted
-> ^ publishSigned
-> sonatypeReleaseAll
+> scripted
+> publishSigned
+> sonatypeBundleRelease
 ```

ReleaseNotes.md

@@ -1,5 +1,9 @@
 ### Release Notes
 
+## 0.16
+  - Remove unnecessary dependencies to slf4j
+  - Upgrade various dependency versions
+
 ## 0.15
   - Update dependencies to use scala-xml 2.x
 

build.sbt

@@ -9,8 +9,8 @@ name                 := "sbt-pack"
 organizationHomepage := Some(new URL("http://xerial.org/"))
 description          := "A sbt plugin for packaging distributable Scala code"
 
-publishMavenStyle       := true
-Test / publishArtifact  := false
+publishMavenStyle      := true
+Test / publishArtifact := false
 
 pomIncludeRepository := { _ =>
   false
@@ -32,9 +32,10 @@ scriptedLaunchOpts ++= {
     Seq("-Dplugin.version=" + version.value)
 }
 
+testFrameworks += new TestFramework("wvlet.airspec.Framework")
+
 libraryDependencies ++= Seq(
-  "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"
+  "org.wvlet.airframe" %% "airspec"          % "22.11.0" % Test,
+  "org.apache.commons"  % "commons-compress" % "1.22",
+  "org.tukaani"         % "xz"               % "1.9"
 )

project/plugins.sbt

@@ -1,10 +1,10 @@
 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.github.sbt"    % "sbt-pgp"      % "2.2.0")
+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")
+addSbtPlugin("com.dwijnand"      % "sbt-dynver"   % "4.1.1")
+addSbtPlugin("org.scalameta"     % "sbt-scalafmt" % "2.4.6")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

src/sbt-test/sbt-pack/duplicate-jars/test

@@ -1,5 +1,5 @@
 > 'set version := "0.1"'
 > pack
-$ exists target/pack/lib/scala-library-2.12.15.jar
+$ exists target/pack/lib/scala-library-2.12.17.jar
 $ absent target/pack/lib/slf4j-api-1.7.2.jar
 $ exists target/pack/lib/slf4j-api-1.7.6.jar

src/sbt-test/sbt-pack/min-project/test

@@ -2,11 +2,11 @@
 > pack
 $ exists target/pack/Makefile
 $ exists target/pack/bin/hello
-$ exists target/pack/lib/scala-library-2.12.15.jar
+$ exists target/pack/lib/scala-library-2.12.17.jar
 $ exec sh ./target/pack/bin/hello
 > packArchive
 $ exists target/min-project-0.1.tar.gz
 > packInstall ../../local
 $ exists local/bin/hello
 $ exists local/min-project/min-project-0.1/lib/min-project-0.1.jar
-$ exists local/min-project/min-project-0.1/lib/scala-library-2.12.15.jar
+$ exists local/min-project/min-project-0.1/lib/scala-library-2.12.17.jar

src/sbt-test/sbt-pack/nested-project/build.sbt

@@ -1,6 +1,6 @@
 name := "nested"
 
-version in ThisBuild := "0.1"
+ThisBuild / version := "0.1"
 
 ThisBuild / scalaVersion := "2.12.17"
 

src/test/scala/xerial/sbt/VersionStringSpec.scala

@@ -1,54 +1,57 @@
 package xerial.sbt
 
-import org.specs2.mutable.Specification
+import wvlet.airspec.AirSpec
 import xerial.sbt.pack.{DefaultVersionStringOrdering, VersionString}
 
-class VersionStringSpec extends Specification {
+import scala.math.Ordered.orderingToOrdered
+
+class VersionStringSpec extends AirSpec {
   implicit val versionStringOrdering = DefaultVersionStringOrdering
 
-  "VersionString" should {
-    "accept any string" in {
+  test("VersionString") {
+    test("accept any string") {
       VersionString("1.0")
       VersionString("1.0-alpha")
       VersionString("1")
       VersionString("-alpha")
       VersionString("1231892")
       VersionString("asd;.a2,.-")
-
-      ok
     }
 
-    "properly deconstruct arbitrary string" in {
-      VersionString("1") === VersionString.fromNumbers(1 :: Nil, None)
-      VersionString("1.2") === VersionString.fromNumbers(1 :: 2 :: Nil, None)
-      VersionString("1.2.3") === VersionString.fromNumbers(1 :: 2 :: 3 :: Nil, None)
-      VersionString("1.2.3.4") === VersionString.fromNumbers(1 :: 2 :: 3 :: 4 :: Nil, None)
-      VersionString("1.2.3.4-alpha") === VersionString.fromNumbers(1 :: 2 :: 3 :: 4 :: Nil, Some("alpha"))
-      VersionString("1.2.3.4-alpha-beta") === VersionString.fromNumbers(1 :: 2 :: 3 :: 4 :: Nil, Some("alpha-beta"))
-      VersionString("foo") === VersionString(List.empty[String], Some("foo"))
-      VersionString("foo.bar") === VersionString(List.empty[String], Some("foo.bar"))
-      VersionString("foo.bar-alpha") === VersionString(List.empty[String], Some("foo.bar-alpha"))
+    test("properly deconstruct arbitrary string") {
+      VersionString("1") shouldBe VersionString.fromNumbers(1 :: Nil, None)
+      VersionString("1.2") shouldBe VersionString.fromNumbers(1 :: 2 :: Nil, None)
+      VersionString("1.2.3") shouldBe VersionString.fromNumbers(1 :: 2 :: 3 :: Nil, None)
+      VersionString("1.2.3.4") shouldBe VersionString.fromNumbers(1 :: 2 :: 3 :: 4 :: Nil, None)
+      VersionString("1.2.3.4-alpha") shouldBe VersionString.fromNumbers(1 :: 2 :: 3 :: 4 :: Nil, Some("alpha"))
+      VersionString("1.2.3.4-alpha-beta") shouldBe VersionString.fromNumbers(
+        1 :: 2 :: 3 :: 4 :: Nil,
+        Some("alpha-beta")
+      )
+      VersionString("foo") shouldBe VersionString(List.empty[String], Some("foo"))
+      VersionString("foo.bar") shouldBe VersionString(List.empty[String], Some("foo.bar"))
+      VersionString("foo.bar-alpha") shouldBe VersionString(List.empty[String], Some("foo.bar-alpha"))
     }
 
-    "properly sort" in {
-      VersionString("1") must be_<(VersionString("1.2.3.4"))
-      VersionString("2") must be_>(VersionString("1.2.3.4"))
-      VersionString("1.2.2") must be_<(VersionString("1.2.3.4"))
-      VersionString("1.2.4") must be_>(VersionString("1.2.3.4"))
-      VersionString("1.2.3.4.5") must be_>(VersionString("1.2.3.4"))
+    test("properly sort") {
+      VersionString("1") < VersionString("1.2.3.4") shouldBe true
+      VersionString("2") > VersionString("1.2.3.4") shouldBe true
+      VersionString("1.2.2") < VersionString("1.2.3.4") shouldBe true
+      VersionString("1.2.4") > VersionString("1.2.3.4") shouldBe true
+      VersionString("1.2.3.4.5") > VersionString("1.2.3.4") shouldBe true
 
-      VersionString("2.9.2") must be_<(VersionString("2.10.4"))
+      VersionString("2.9.2") < VersionString("2.10.4") shouldBe true
 
-      VersionString("1.2") must be_>(VersionString("1.2-alpha"))
-      VersionString("1.2-beta") must be_>(VersionString("1.2-alpha"))
+      VersionString("1.2") > VersionString("1.2-alpha") shouldBe true
+      VersionString("1.2-beta") > VersionString("1.2-alpha") shouldBe true
 
-      VersionString("apple") must be_<(VersionString("pie"))
+      VersionString("apple") < VersionString("pie") shouldBe true
     }
 
-    "preserve 0-padding in version strings" in {
+    test("preserve 0-padding in version strings") {
       val v = VersionString("1.09")
-      v.major mustEqual "1"
-      v.minor mustEqual Some("09")
+      v.major shouldBe "1"
+      v.minor shouldBe Some("09")
     }
   }
 }