Skip to content
Snippets Groups Projects
Verified Commit 516f567d authored by Rico Bergmann's avatar Rico Bergmann
Browse files

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.
parent 45c9e711
Branches
Tags
2 merge requests!2Publish v0.1,!1Move away from experimental changes
...@@ -27,8 +27,10 @@ lazy val generator = (project in file(".")) ...@@ -27,8 +27,10 @@ lazy val generator = (project in file("."))
case "MANIFEST.MF" => MergeStrategy.first case "MANIFEST.MF" => MergeStrategy.first
case "plugin.xml" => MergeStrategy.discard case "plugin.xml" => MergeStrategy.discard
case "plugin.properties" => MergeStrategy.discard case "plugin.properties" => MergeStrategy.discard
case "schema/generated_package.exsd" => MergeStrategy.discard case "generated_package.exsd" => MergeStrategy.discard
case "schema/dynamic_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 => case x =>
val oldStrategy = (assemblyMergeStrategy in assembly).value val oldStrategy = (assemblyMergeStrategy in assembly).value
oldStrategy(x) oldStrategy(x)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment