Skip to content

Commit 3a4e512

Browse files
committed
the jar should work now
1 parent eb5cb05 commit 3a4e512

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

build.sbt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,23 @@ libraryDependencies ++= Seq(
2323
"org.polystat" % "far" % "0.2.0",
2424
)
2525

26+
packageOptions := Seq(
27+
sbt.Package.ManifestAttributes(
28+
("EO-Version", "https://github.com/nikololiahim/polystat-cli/issues/18")
29+
)
30+
)
31+
2632
assembly / assemblyJarName := "polystat.jar"
2733
assembly / mainClass := (Compile / mainClass).value
34+
assembly / assemblyMergeStrategy := {
35+
case p if p.endsWith("versions/9/module-info.class") =>
36+
MergeStrategy.first
37+
case PathList(ps @ _*) if ps.last.endsWith("log4j.properties") =>
38+
MergeStrategy.first
39+
case x =>
40+
val oldStrategy = (ThisBuild / assemblyMergeStrategy).value
41+
oldStrategy(x)
42+
}
2843

2944
enablePlugins(BuildInfoPlugin)
3045
buildInfoKeys := Seq(version)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
1+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.0.0-RC1")
22
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
33
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
44
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")

0 commit comments

Comments
 (0)