From 1ea4784be4c5e1f755738421bdf64ec11f43cd2b Mon Sep 17 00:00:00 2001 From: Olivier Filangi Date: Fri, 9 Jun 2023 13:31:32 +0200 Subject: [PATCH 1/2] update assembly dependencies (#69) Co-authored-by: Olivier Filangi --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 592c8a5..27f49f5 100644 --- 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") From 2982f231bba4fe44db0e849418c476f2d3d000f6 Mon Sep 17 00:00:00 2001 From: Olivier Filangi Date: Fri, 9 Jun 2023 13:46:31 +0200 Subject: [PATCH 2/2] Fix assembly (#70) * update assembly dependencies * fix creation assembly directory --------- Co-authored-by: Olivier Filangi --- build.sbt | 1 + docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e1ac5ad..5b2a4d3 100644 --- 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 index bd6dc0b..633369e 100644 --- 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/