Skip to content

Commit

Permalink
Merge pull request #21 from GiganticMinecraft/renovate/com.eed3si9n-s…
Browse files Browse the repository at this point in the history
…bt-assembly-2.x

chore(deps): update dependency com.eed3si9n:sbt-assembly to v2
  • Loading branch information
Lucky authored Jan 14, 2024
2 parents 53a70c6 + 102c53a commit 88fe026
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-and-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: sbt assembly

- name: Clean build artifact for caching target folder
run: rm -r target/build
run: rm -r ./target/scala-*/RegenerateWorld-*.jar
cd:
name: Release
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -61,8 +61,8 @@ jobs:
with:
body: ${{ steps.changelog.outputs.clean_changelog }}
tag_name: ${{ steps.changelog.outputs.tag }}
files: ./target/build/RegenerateWorld-*.jar
files: ./target/scala-*/RegenerateWorld-*.jar

- name: Clean build artifact for caching target folder
if: ${{ steps.changelog.outputs.skipped == 'false' }}
run: rm -r target/build
run: rm -r ./target/scala-*/RegenerateWorld-*.jar
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ unmanagedResources / excludeFilter :=
lazy val root = (project in file(".")).settings(
name := "RegenerateWorld",
scalaVersion := "2.13.12",
assembly / assemblyOutputPath := baseDirectory.value / "target" / "build" / s"${name.value}-${version.value}.jar",
assembly / assemblyJarName := s"${name.value}-${version.value}.jar",
assembly / test := (Test / test).value, // assmeblyの中でtestをする
// scalafixがsemanticdbを必要とする
semanticdbEnabled := true,
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// FatJarを生成するためのプラグイン
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
// Lintをするためのプラグイン
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
// Formatをするためのプラグイン
Expand Down

0 comments on commit 88fe026

Please sign in to comment.