assembly

chester-lang · Oct 23, 2024 · 5d19f74 · 5d19f74
1 parent c9e8ed6
commit 5d19f74
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -261,18 +261,7 @@ ThisBuild / assemblyMergeStrategy := {
     MergeStrategy.discard
   case PathList("META-INF", "eclipse.inf")                    => MergeStrategy.discard
   case PathList("META-INF", "groovy-release-info.properties") => MergeStrategy.discard
-  // solved
-  // case PathList("org", "jline", xs @ _*)                          => MergeStrategy.first
-  // case PathList("META-INF", "native-image", "org.jline", xs @ _*) => MergeStrategy.first
-  // solved
-  // case PathList("scala", "tools", xs @ _*) => MergeStrategy.first
-  // case PathList("scala-asm.properties")    => MergeStrategy.discard
-  // case PathList("compiler.properties")     => MergeStrategy.discard
-  // solved
-  // case PathList("org", "osgi", "service", "prefs", xs @ _*) => MergeStrategy.first
-  // solved
-  // case PathList("org", "objectweb", "asm", xs @ _*) => MergeStrategy.first
-  // TODO
+  case PathList("scala","meta","internal","tokenizers",xml) if xml.contains("XmlParser") || xml.contains("ScalaExprPositionParser") => MergeStrategy.preferProject // our overrides
   case PathList("META-INF", "native-image", xs @ _*) if xs.contains("jni-config.json") || xs.contains("reflect-config.json") => MergeStrategy.discard
   case x =>
     val oldStrategy = (ThisBuild / assemblyMergeStrategy).value