From f4187720d2d17d92836974bb564c570fddf122c9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 16 Dec 2021 09:50:17 +0100 Subject: [PATCH 1/3] Update json4s-jackson_2.13 to 4.0.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d5bf33b..7b10b65 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ lazy val root = (project in file(".")).settings( name := "LibreCaptcha", libraryDependencies += "com.sksamuel.scrimage" % "scrimage-core" % "4.0.24", libraryDependencies += "com.sksamuel.scrimage" % "scrimage-filters" % "4.0.24", - libraryDependencies += "org.json4s" % "json4s-jackson_2.13" % "3.6.12" + libraryDependencies += "org.json4s" % "json4s-jackson_2.13" % "4.0.3" ) Compile / unmanagedResourceDirectories += { baseDirectory.value / "lib" } From 700bd2d9109a7e82c1ec2445c9e70cf665bf8171 Mon Sep 17 00:00:00 2001 From: hrj Date: Mon, 27 Dec 2021 20:01:12 +0530 Subject: [PATCH 2/3] assembly merge strategy that discards module-info This is to fix this error: deduplicate: different file contents found in the following: [error] [snip] jackson-annotations/2.12.4/jackson-annotations-2.12.4.jar:module-info.class [error] [snip] jackson-core/2.12.4/jackson-core-2.12.4.jar:module-info.class --- build.sbt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.sbt b/build.sbt index 7b10b65..8575b3a 100644 --- a/build.sbt +++ b/build.sbt @@ -29,4 +29,11 @@ assembly / mainClass := Some("lc.LCFramework") Compile / run / mainClass := Some("lc.LCFramework") assembly / assemblyJarName := "LibreCaptcha.jar" +assembly / assemblyMergeStrategy := { + case x if x.endsWith("/module-info.class") => MergeStrategy.discard + case x => + val oldStrategy = (assembly / assemblyMergeStrategy).value + oldStrategy(x) +} + run / fork := true From 4988e2e856a22f9a38948a423e79550d614272c9 Mon Sep 17 00:00:00 2001 From: hrj Date: Mon, 27 Dec 2021 20:19:20 +0530 Subject: [PATCH 3/3] update assembly merge strategy to use latest conventinon Signed-off-by: hrj --- build.sbt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 8575b3a..0245cb7 100644 --- a/build.sbt +++ b/build.sbt @@ -29,10 +29,11 @@ assembly / mainClass := Some("lc.LCFramework") Compile / run / mainClass := Some("lc.LCFramework") assembly / assemblyJarName := "LibreCaptcha.jar" -assembly / assemblyMergeStrategy := { +ThisBuild / assemblyMergeStrategy := { + case PathList("module-info.class") => MergeStrategy.discard case x if x.endsWith("/module-info.class") => MergeStrategy.discard case x => - val oldStrategy = (assembly / assemblyMergeStrategy).value + val oldStrategy = (ThisBuild / assemblyMergeStrategy).value oldStrategy(x) }