Merge pull request #28 from GiganticMinecraft/sbt-assembly

Sbt assembly
GiganticMinecraft · Jan 4, 2024 · d493457 · d493457
2 parents 4d43194 + 3209fcb
commit d493457
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/publish-assembled-jar.yml b/.github/workflows/publish-assembled-jar.yml
@@ -14,7 +14,7 @@ jobs:
           submodules: recursive
 
       - name: Build artifact
-        run: sbt assembly
+        run: mkdir -p target/build && ./sbt assembly
 
       - name: Release
         uses: softprops/action-gh-release@v1

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -14,4 +14,4 @@ jobs:
           submodules: recursive
 
       - name: Build artifact
-        run: sbt assembly
+        run: mkdir -p target/build && ./sbt assembly
diff --git a/prepare-docker.bat b/prepare-docker.bat
@@ -1,5 +1,6 @@
 call rd /s /q target\build
 
+mkdir target\build
 call sbt assembly || goto :onerror
 
 REM https://stackoverflow.com/a/23812179

diff --git a/prepare-docker.sh b/prepare-docker.sh
@@ -5,7 +5,7 @@ build_image() {
 
   rm -r target/build || true
 
-  ./sbt assembly
+  mkdir -p target/build && ./sbt assembly
 
   cp -n docker/spigot/eula.txt docker/spigot/serverfiles/eula.txt || true
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
		addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")