From 897a3d248d7d6bd68d047aef5b386777ccb3eeb3 Mon Sep 17 00:00:00 2001 From: kdelmas Date: Fri, 22 May 2026 12:01:23 +0200 Subject: [PATCH 1/2] Add lib folder --- .github/workflows/docker.yml | 1 + .github/workflows/release.yml | 1 + .github/workflows/scala-test.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 500f9e32..665a3c7d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -70,6 +70,7 @@ jobs: - if: ${{ steps.cache-monosat.outputs.cache-hit != 'true' }} name: Moving monosat.jar and monosat.so run: | + mkdir lib cp monosat/build/monosat.jar lib mkdir binlib cp monosat/build/libmonosat.so binlib diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52a2203a..aee32128 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,6 +64,7 @@ jobs: - if: ${{ steps.cache-monosat.outputs.cache-hit != 'true' }} name: Moving monosat.jar and monosat.so run: | + mkdir lib cp monosat/build/monosat.jar lib mkdir binlib cp monosat/build/libmonosat.so binlib diff --git a/.github/workflows/scala-test.yml b/.github/workflows/scala-test.yml index c43225ef..2b3d47bd 100644 --- a/.github/workflows/scala-test.yml +++ b/.github/workflows/scala-test.yml @@ -69,6 +69,7 @@ jobs: - if: ${{ steps.cache-monosat.outputs.cache-hit != 'true' }} name: Moving monosat.jar and monosat.so run: | + mkdir lib cp monosat/build/monosat.jar lib mkdir binlib cp monosat/build/libmonosat.so binlib From 4eb3f78e40a78c3f8e6e2f12a7fb646eb5b6feca Mon Sep 17 00:00:00 2001 From: kdelmas Date: Sun, 24 May 2026 16:33:01 +0200 Subject: [PATCH 2/2] Discard module info files --- build.sbt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.sbt b/build.sbt index 8971b24f..ec56da68 100644 --- a/build.sbt +++ b/build.sbt @@ -144,6 +144,12 @@ lazy val docSetting = lazy val assemblySettings = Seq( assembly / assemblyJarName := s"PMLAnalyzer_${version.value}.jar", + assembly / assemblyMergeStrategy := { + case x if x.endsWith("module-info.class") => MergeStrategy.discard + case x => + val oldStrategy = (assembly / assemblyMergeStrategy ).value + oldStrategy(x) + } ) lazy val compileSettings = Seq(