Commit 206cb1fe authored by 35V LG84's avatar 35V LG84

Fix cli/assembly with jdk 8 vs 11

Updated transitive dep via jgit has module-info.class files,
and these will conflict with assembly jar:

* org/bouncycastle/bcprov-jdk15on/1.61/bcprov-jdk15on-1.61.jar
* org/bouncycastle/bcpg-jdk15on/1.61/bcpg-jdk15on-1.61.jar
* org/bouncycastle/bcpkix-jdk15on/1.61/bcpkix-jdk15on-1.61.jar

Fix this by discarding module-info.class for cli target
(bc it's app, not lib, and all libs are included into assembly jar).
Signed-off-by: 35V LG84's avatar35V LG84 <35vlg84-x4e6b92@e257.fi>
parent d1d5b802
......@@ -146,7 +146,15 @@ lazy val cli = (project in file("cli")).
Tests.Setup(() => TacklerTests.setup("tests", log))
},
assembly / test := {},
assemblyJarName in assembly := "tackler-cli" + "-" + version.value + ".jar",
assembly / assemblyJarName := "tackler-cli" + "-" + version.value + ".jar",
assembly / assemblyMergeStrategy := {
// Fix module-info.class with JDK 8 vs. JDK 11,
// it's not needed, this is app, not lib
case "module-info.class" => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
},
gitCommitId := git.gitHeadCommit.value.getOrElse("Not available"),
gitLocalChanges := git.gitUncommittedChanges.value,
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion, gitCommitId, gitLocalChanges),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment