Skip to content

Commit 8decfe3

Browse files
committed
Fix assembly issues
1 parent 6a01a6a commit 8decfe3

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

build.sbt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ lazy val trayUtil = (project in file("tray-util"))
112112
libraryDependencies ++= commonLibs ++ jvmLibs,
113113
assembly / assemblyJarName := "loctio-tray.jar",
114114
assembly / assemblyMergeStrategy := {
115+
case PathList("module-info.class") => MergeStrategy.discard // not creating library, discard should be OK
116+
case path if path.endsWith("/module-info.class") => MergeStrategy.discard
115117
case x if x.contains("io.netty.versions.properties") => MergeStrategy.discard
116118
case x =>
117119
val oldStrategy = (assembly / assemblyMergeStrategy).value
@@ -203,6 +205,8 @@ lazy val backend = (project in file("backend"))
203205
MergeStrategy.first
204206
case PathList("META-INF", ps @ _*) if ps.nonEmpty && Seq("native-image.properties", "reflection-config.json").contains(ps.last) =>
205207
MergeStrategy.first
208+
case PathList("module-info.class") => MergeStrategy.discard // not creating library, discard should be OK
209+
case path if path.endsWith("/module-info.class") => MergeStrategy.discard
206210
case x =>
207211
// default handling for things like INDEX.LIST (see https://stackoverflow.com/a/46287790/16673)
208212
val oldStrategy = (assembly / assemblyMergeStrategy).value

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" % "0.14.10")
1+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
22

33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
44

0 commit comments

Comments
 (0)