Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xerial/sbt-pack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.19
Choose a base ref
...
head repository: xerial/sbt-pack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.20
Choose a head ref
  • 13 commits
  • 7 files changed
  • 3 contributors

Commits on Mar 3, 2024

  1. internal: Stick to Scala 2.12.x versions (#489)

    @xerial
    xerial authored Mar 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    584b584 View commit details

  2. Update airspec to 24.3.0 (#490)

    @xerial-bot
    xerial-bot authored Mar 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1a59a10 View commit details

Commits on Mar 9, 2024

  1. Update commons-compress to 1.26.1 (#491)

    @xerial-bot
    xerial-bot authored Mar 9, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3d77464 View commit details

Commits on Mar 19, 2024

  1. fix: commons-codec becomes unnecessary for commons-compress 1.26.1 (#492 

    )
    @xerial
    xerial authored Mar 19, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b75b321 View commit details

Commits on Mar 29, 2024

  1. Update scalafmt-core to 3.8.1 (#493) 

    * Update scalafmt-core to 3.8.1

* Reformat with scalafmt 3.8.1

Executed command: scalafmt --non-interactive

* Add 'Reformat with scalafmt 3.8.1' to .git-blame-ignore-revs
    @xerial-bot
    xerial-bot authored Mar 29, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9acb75f View commit details

Commits on Apr 9, 2024

  1. Update airspec to 24.4.0 (#494)

    @xerial-bot
    xerial-bot authored Apr 9, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    andrzej-stencel Andrzej Stencel
    GPG key ID: 7C2623790D296CA0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    79730ca View commit details

Commits on Apr 21, 2024

  1. Update airspec to 24.4.1 (#495)

    @xerial-bot
    xerial-bot authored Apr 21, 2024
    Copy the full SHA
    6e22833 View commit details

Commits on Apr 23, 2024

  1. Update airspec to 24.4.2 (#496)

    @xerial-bot
    xerial-bot authored Apr 23, 2024
    Copy the full SHA
    af3288a View commit details

Commits on Apr 24, 2024

  1. Update airspec to 24.4.3 (#497)

    @xerial-bot
    xerial-bot authored Apr 24, 2024

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    8bf5ae1 View commit details

Commits on Apr 25, 2024

  1. Update sbt-twirl, twirl-api to 2.0.5 (#499)

    @xerial-bot
    xerial-bot authored Apr 25, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    65bf6a6 View commit details

Commits on May 6, 2024

  1. Update airspec to 24.5.0 (#501)

    @xerial-bot
    xerial-bot authored May 6, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    506924f View commit details

Commits on May 8, 2024

  1. Update sbt, scripted-plugin to 1.10.0 (#500)

    @xerial-bot
    xerial-bot authored May 8, 2024

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    AustinAbro321 Austin Abro
    GPG key ID: 92EB5159E403F9D6
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    671d916 View commit details

  2. Use POSIX compliant command -v (#498) 

    This removes the `which` package dependency, allowing Linux containers to run with this additional package.
    @KevinAtSesam
    KevinAtSesam authored May 8, 2024
    Copy the full SHA
    9cb1a51 View commit details
Showing with 15 additions and 12 deletions.
  1. +3 −0 .git-blame-ignore-revs
  2. +2 −0 .scala-steward.conf
  3. +1 −1 .scalafmt.conf
  4. +3 −5 build.sbt
  5. +1 −1 project/build.properties
  6. +1 −1 project/plugins.sbt
  7. +4 −4 src/main/twirl/xerial/sbt/pack/launch.scala.txt
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.6.1
8bc6d72c02004bacb63f930d1a6afdb7bcd6386d

# Scala Steward: Reformat with scalafmt 3.8.1
d0abba1b5476a23955c10033f742d06a1751b30a
2 changes: 2 additions & 0 deletions .scala-steward.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# sbt plugins must use Scala 2.12.x
updates.pin = [ { groupId = "org.scala-lang", artifactId="scala-library", version = "2.12." } ]
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.0
version = 3.8.1
project.layout = StandardConvention
runner.dialect = scala212
maxColumn = 120
8 changes: 3 additions & 5 deletions build.sbt
View file
Original file line number Diff line number Diff line change
@@ -35,9 +35,7 @@ scriptedLaunchOpts ++= {
testFrameworks += new TestFramework("wvlet.airspec.Framework")

libraryDependencies ++= Seq(
"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"
"org.wvlet.airframe" %% "airspec" % "24.5.0" % Test,
"org.apache.commons" % "commons-compress" % "1.26.1",
"org.tukaani" % "xz" % "1.9"
)
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
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.4")
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.5")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

8 changes: 4 additions & 4 deletions src/main/twirl/xerial/sbt/pack/launch.scala.txt
View file
Original file line number Diff line number Diff line change
@@ -60,16 +60,16 @@ case "`uname`" in
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
fi
JAVA_OPTS="$JAVA_OPTS -Xdock:name=\"${PROG_NAME}\" -Xdock:icon=\"$PROG_HOME/@(opts.MAC_ICON_FILE)\" -Dapple.laf.useScreenMenuBar=true"
JAVACMD="`which java`"
JAVACMD="`command -v java`"
;;
esac

# Resolve JAVA_HOME from javac command path
if [ -z "$JAVA_HOME" ]; then
javaExecutable="`which javac`"
javaExecutable="`command -v javac`"
if [ -n "$javaExecutable" -a -f "$javaExecutable" -a ! "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
# readlink(1) is not available as standard on Solaris 10.
readLink=`which readlink`
readLink=`command -v readlink`
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
javaExecutable="`readlink -f \"$javaExecutable\"`"
javaHome="`dirname \"$javaExecutable\"`"
@@ -90,7 +90,7 @@ if [ -z "$JAVACMD" ] ; then
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD="`which java`"
JAVACMD="`command -v java`"
fi
fi