From 516f567d756d719db2dc1f4ef458ac94a0fc30aa Mon Sep 17 00:00:00 2001 From: Rico Bergmann <rico.bergmann1@tu-dresden.de> Date: Sun, 23 Sep 2018 20:13:36 +0200 Subject: [PATCH] Fix assembly only working on UNIX-like machines The path matching will now be independent of the actual representation of a path on the user's platform. --- build.sbt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 9591be9..1660dd3 100644 --- a/build.sbt +++ b/build.sbt @@ -27,8 +27,10 @@ lazy val generator = (project in file(".")) case "MANIFEST.MF" => MergeStrategy.first case "plugin.xml" => MergeStrategy.discard case "plugin.properties" => MergeStrategy.discard - case "schema/generated_package.exsd" => MergeStrategy.discard - case "schema/dynamic_package.exsd" => MergeStrategy.discard + case "generated_package.exsd" => MergeStrategy.discard + case "dynamic_package.exsd" => MergeStrategy.discard + case PathList("schema", ps @ _ *) if ps.lastOption.exists(_.endsWith("generated_package.exsd")) => MergeStrategy.discard + case PathList("schema", ps @ _ *) if ps.lastOption.exists(_.endsWith("dynamic_package.exsd")) => MergeStrategy.discard case x => val oldStrategy = (assemblyMergeStrategy in assembly).value oldStrategy(x) -- GitLab