Merge branch 'develop' of github.com:p2m2/p2m2tools into develop

p2m2 · Jun 9, 2023 · 8d5ea9b · 8d5ea9b
2 parents a9f7ee7 + 2982f23
commit 8d5ea9b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -75,6 +75,7 @@ publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true)
 pomIncludeRepository := { _ => false }
 publishMavenStyle := true
 assembly / target := file("assembly")
+assembly / assemblyJarName := s"p2m2-$static_version.jar"
 assembly / logLevel := Level.Info
 assembly / assemblyMergeStrategy := {
   case PathList("META-INF", xs @ _*) => MergeStrategy.last

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN git clone ${REPOSITORY_URL} /p2m2tools_repo
 WORKDIR /p2m2tools_repo
 
 
-RUN git checkout ${BRANCH} && sbt coverageOff assembly
+RUN git checkout ${BRANCH} && mkdir -p assembly && sbt coverageOff assembly
 
 COPY p2m2tools /usr/bin/
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.eed3si9n"       % "sbt-assembly"                  % "1.1.0")
+addSbtPlugin("com.eed3si9n"       % "sbt-assembly"                  % "2.1.1")
 addSbtPlugin("org.scoverage"      % "sbt-scoverage"                 % "2.0.0")
 addSbtPlugin("io.crashbox"        % "sbt-gpg"                       % "0.2.1")
 addSbtPlugin("com.github.sbt"     % "sbt-release"                   % "1.1.0")