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: 0.17
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.18
Choose a head ref

Commits on Nov 24, 2022

  1. Copy the full SHA
    d41754b View commit details
  2. Use sbt-soantype 3.9.15

    xerial committed Nov 24, 2022
    Copy the full SHA
    6f3e57a View commit details
  3. Update ReleaseNotes.md

    xerial authored Nov 24, 2022
    Copy the full SHA
    91bcd53 View commit details

Commits on Dec 2, 2022

  1. Copy the full SHA
    5417347 View commit details

Commits on Dec 18, 2022

  1. Copy the full SHA
    0ca0dd4 View commit details
  2. Copy the full SHA
    066393d View commit details

Commits on Dec 31, 2022

  1. Copy the full SHA
    7b49c8c View commit details
  2. Copy the full SHA
    06f01fd View commit details
  3. Copy the full SHA
    7d60866 View commit details

Commits on Jan 5, 2023

  1. Copy the full SHA
    c75f811 View commit details

Commits on Jan 18, 2023

  1. Copy the full SHA
    8990ca1 View commit details
  2. Copy the full SHA
    63e01fd View commit details

Commits on Jan 28, 2023

  1. Copy the full SHA
    faefa26 View commit details
  2. Copy the full SHA
    0f9def1 View commit details
  3. Copy the full SHA
    45a089f View commit details
  4. Copy the full SHA
    d4dd8ae View commit details

Commits on Feb 4, 2023

  1. Copy the full SHA
    5d5f044 View commit details
  2. Copy the full SHA
    7a7351d View commit details

Commits on Feb 8, 2023

  1. Copy the full SHA
    72f3b90 View commit details

Commits on Feb 27, 2023

  1. Bump olafurpg/setup-scala from 13 to 14 (#370)

    Bumps [olafurpg/setup-scala](https://github.com/olafurpg/setup-scala) from 13 to 14.
    - [Release notes](https://github.com/olafurpg/setup-scala/releases)
    - [Commits](olafurpg/setup-scala@v13...v14)
    
    ---
    updated-dependencies:
    - dependency-name: olafurpg/setup-scala
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 27, 2023
    Copy the full SHA
    a9a3724 View commit details
  2. Copy the full SHA
    0fd8312 View commit details
  3. Copy the full SHA
    0ddb243 View commit details

Commits on Mar 10, 2023

  1. Copy the full SHA
    7641e8c View commit details
  2. Copy the full SHA
    da3802f View commit details

Commits on Mar 13, 2023

  1. Copy the full SHA
    653deef View commit details

Commits on Apr 7, 2023

  1. Copy the full SHA
    8c32ce5 View commit details
  2. Copy the full SHA
    54604b5 View commit details

Commits on May 1, 2023

  1. Copy the full SHA
    9aadd38 View commit details

Commits on May 5, 2023

  1. Copy the full SHA
    f02359b View commit details
  2. Copy the full SHA
    1367745 View commit details

Commits on May 11, 2023

  1. Copy the full SHA
    06478ab View commit details

Commits on May 15, 2023

  1. Copy the full SHA
    09a91bc View commit details
  2. Update commons-compress to 1.23.0 (#380)

    * Update commons-compress to 1.23.0
    
    * Revert commit(s) e383a98
    
    * Update commons-compress to 1.23.0
    
    * Revert commit(s) 5f29d14
    
    * Update commons-compress to 1.23.0
    
    * Revert commit(s) 5aeb741
    
    * Update commons-compress to 1.23.0
    
    * Revert commit(s) 7846fde
    
    * Update commons-compress to 1.23.0
    xerial-bot authored May 15, 2023
    Copy the full SHA
    7dd5025 View commit details

Commits on May 24, 2023

  1. ci(Mergify): configuration update (#401)

    Signed-off-by: Taro L. Saito <leo@xerial.org>
    xerial authored May 24, 2023
    Copy the full SHA
    ce52c56 View commit details
  2. Copy the full SHA
    34a79b4 View commit details
  3. Copy the full SHA
    7154509 View commit details
  4. Add release note genertor

    xerial committed May 24, 2023
    Copy the full SHA
    678e6fc View commit details
  5. Copy the full SHA
    1ab1b8a View commit details
  6. Copy the full SHA
    67c8db1 View commit details
  7. Copy the full SHA
    ace4cc9 View commit details

Commits on May 25, 2023

  1. Copy the full SHA
    cb45c64 View commit details

Commits on May 31, 2023

  1. Copy the full SHA
    37953d4 View commit details

Commits on Jun 2, 2023

  1. Copy the full SHA
    02d5e3c View commit details

Commits on Jun 4, 2023

  1. Copy the full SHA
    a343a5d View commit details

Commits on Jun 7, 2023

  1. Copy the full SHA
    e581067 View commit details

Commits on Jun 12, 2023

  1. Copy the full SHA
    714db61 View commit details

Commits on Jun 15, 2023

  1. Copy the full SHA
    679fde8 View commit details

Commits on Jun 17, 2023

  1. Copy the full SHA
    aed14ad View commit details

Commits on Jun 23, 2023

  1. Copy the full SHA
    04cf4fa View commit details

Commits on Jun 30, 2023

  1. Copy the full SHA
    df6926d View commit details
31 changes: 31 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
changelog:
categories:
- title: '🔥 Breaking Changes'
labels:
- 'breaking'
- title: '👋 Deprecated'
labels:
- 'deprecation'
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'bug'
- title: '🔗 Dependency Updates'
labels:
- 'library-update'
- 'dependencies'
- title: '🛠 Internal Updates'
labels:
- 'internal'
- 'kaizen'
- 'test-library-update'
- 'sbt-plugin-update'
- title: '📚 Docs'
labels:
- 'doc'
- title: Other Changes
labels:
- "*"
5 changes: 1 addition & 4 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Release Drafter

on:
push:
branches:
- master
# pull_request event is required only for autolabeler
pull_request:
# Only following types are handled by the action, but one can default to all as well
@@ -19,7 +16,7 @@ jobs:
update_release_draft:
permissions:
# write permission is required to create a github release
contents: write
contents: read
# write permission is required for autolabeler
# otherwise, read permission is required at least
pull-requests: write
18 changes: 18 additions & 0 deletions .github/workflows/release-note.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Release Note

on:
push:
tags:
- v*
workflow_dispatch:

jobs:
release:
name: Create a new release note
runs-on: ubuntu-latest
steps:
- name: Create a release note
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh release create "$GITHUB_REF_NAME" --repo="$GITHUB_REPOSITORY" --generate-notes
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -22,15 +22,15 @@ jobs:
name: Code format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: scalafmt test
run: ./sbt scalafmtCheckAll
test_sbt_plugin:
name: plugin test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: olafurpg/setup-scala@v13
- uses: actions/checkout@v4
- uses: olafurpg/setup-scala@v14
with:
java-version: adopt@1.11
- name: scripted tests
17 changes: 17 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
pull_request_rules:
- name: Automatic merge Scala Steward PRs
conditions:
- author=xerial-bot
- check-success=Code format
- check-success=plugin test
- or:
- title~=^Update airframe-
- title~=^Update sbt-airframe
- title~=^Update airspec
- title~=^Update scalafmt-core
- label=sbt-plugin-update
- label=test-library-update
- label=library-update
actions:
merge:
method: squash
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.6.1
version = 3.7.15
project.layout = StandardConvention
runner.dialect = scala212
maxColumn = 120
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -212,8 +212,8 @@ packMain := Map("myapp"->"org.yourdomain.MyApp")

**Dockerfile**
```
# Using an Alpine Linux based JDK image
FROM anapsix/alpine-java:8u131b11_jdk
# Using JDK17 from Amazon Corretto
FROM FROM amazoncorretto:17
COPY target/pack /srv/myapp
2 changes: 2 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### Release Notes

Note: See https://github.com/xerial/sbt-pack/releases for future relase notes

## 0.16
- Remove unnecessary dependencies to slf4j
- Upgrade various dependency versions
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ pomIncludeRepository := { _ =>
false
}

ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"

parallelExecution := true
crossPaths := false
@@ -35,7 +35,7 @@ scriptedLaunchOpts ++= {
testFrameworks += new TestFramework("wvlet.airspec.Framework")

libraryDependencies ++= Seq(
"org.wvlet.airframe" %% "airspec" % "22.11.4" % Test,
"org.apache.commons" % "commons-compress" % "1.22",
"org.wvlet.airframe" %% "airspec" % "23.11.3" % Test,
"org.apache.commons" % "commons-compress" % "1.24.0",
"org.tukaani" % "xz" % "1.9"
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.0
sbt.version=1.9.7
12 changes: 6 additions & 6 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always

addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.14")
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.5.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4")
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.1")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/archive-modules/build.sbt
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import xerial.sbt.pack.PackPlugin._

val commonSettings = Defaults.coreDefaultSettings ++
Seq(
scalaVersion := "2.12.17",
scalaVersion := "2.12.18",
version := "0.1",
crossPaths := false
)
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/build-sbt/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
enablePlugins(PackPlugin)

scalaVersion := "2.12.17"
scalaVersion := "2.12.18"

packExtraClasspath := Map("hello" -> Seq("${PROG_HOME}/extra"))
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/convention-full/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
enablePlugins(PackPlugin)

scalaVersion := "2.12.17"
scalaVersion := "2.12.18"

libraryDependencies := Seq("org.xerial" % "xerial-core" % "3.3.6")

2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/convention-noversion/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
enablePlugins(PackPlugin)

scalaVersion := "2.12.17"
scalaVersion := "2.12.18"

libraryDependencies := Seq("org.xerial" % "xerial-core" % "3.3.6")

4 changes: 2 additions & 2 deletions src/sbt-test/sbt-pack/copy-dependencies/build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"

val commonSettings = Seq(
scalaVersion := "2.12.17",
scalaVersion := "2.12.18",
version := "0.1",
crossPaths := false,
packCopyDependenciesTarget := target.value / "WEB-INF/lib"
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/duplicate-jars/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"
val commonSettings = Defaults.coreDefaultSettings ++ Seq(
version := "0.1",
crossPaths := false
1 change: 0 additions & 1 deletion src/sbt-test/sbt-pack/duplicate-jars/test
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
> 'set version := "0.1"'
> pack
$ 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
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/env-vars/build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
enablePlugins(PackPlugin)
name := "env-vars"

scalaVersion := "2.12.17"
scalaVersion := "2.12.18"
// custom settings here
crossPaths := false

2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/exclude-jars/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
enablePlugins(PackPlugin)
version := "0.1"
scalaVersion := "2.12.17"
scalaVersion := "2.12.18"
crossPaths := false
name := "exclude-jars"
libraryDependencies ++= Seq(
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/exclude-makefile/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
enablePlugins(PackPlugin)
scalaVersion := "2.12.17"
scalaVersion := "2.12.18"
crossPaths := false
name := "exclude-makefile"
version := "0.1"
4 changes: 2 additions & 2 deletions src/sbt-test/sbt-pack/exclude-test-config/build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"

val commonSettings = Seq(
scalaVersion := "2.12.17",
scalaVersion := "2.12.18",
version := "0.1",
crossPaths := false
)
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/min-project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
enablePlugins(PackPlugin)
name := "min-project"

scalaVersion := "2.12.17"
scalaVersion := "2.12.18"
// custom settings here
crossPaths := false
2 changes: 0 additions & 2 deletions src/sbt-test/sbt-pack/min-project/test
Original file line number Diff line number Diff line change
@@ -2,11 +2,9 @@
> pack
$ exists target/pack/Makefile
$ exists target/pack/bin/hello
$ 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.17.jar
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/multi-module/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val commonSettings = Defaults.coreDefaultSettings ++ Seq(
scalaVersion := "2.12.17",
scalaVersion := "2.12.18",
version := "0.1",
crossPaths := false
)
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/nested-project/build.sbt
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ name := "nested"

ThisBuild / version := "0.1"

ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"

enablePlugins(PackPlugin)

2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/pack-resources/build.sbt
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ lazy val root = Project(
base = file(".")
).enablePlugins(PackPlugin)
.settings(
scalaVersion := "2.12.17",
scalaVersion := "2.12.18",
// Copy files from ${root}/web/... to ${root}/target/pack/web-content...
packResourceDir += (baseDirectory.value / "web" -> "web-content"),
// custom settings here
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-pack/space in path/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
enablePlugins(PackPlugin)

scalaVersion := "2.12.17"
scalaVersion := "2.12.18"