File tree 2 files changed +7
-1
lines changed
2 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -132,6 +132,12 @@ lazy val core = myCrossProject("core")
132
132
// https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.20/kotlin-stdlib-1.4.20.jar:META-INF/versions/9/module-info.class
133
133
// https/repo1.maven.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar:META-INF/versions/9/module-info.class
134
134
MergeStrategy .first
135
+ case PathList (" module-info.class" ) =>
136
+ // (core / assembly) deduplicate: different file contents found in the following:
137
+ // https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.12.6/jackson-annotations-2.12.6.jar:module-info.class
138
+ // https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.12.6/jackson-core-2.12.6.jar:module-info.class
139
+ // https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.12.6.1/jackson-databind-2.12.6.1.jar:module-info.class
140
+ MergeStrategy .discard
135
141
case otherwise =>
136
142
val defaultStrategy = (assembly / assemblyMergeStrategy).value
137
143
defaultStrategy(otherwise)
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ object Dependencies {
30
30
val http4sOkhttpClient = " org.http4s" %% " http4s-okhttp-client" % http4sCore.revision
31
31
val log4catsSlf4j = " org.typelevel" %% " log4cats-slf4j" % " 2.3.1"
32
32
val logbackClassic = " ch.qos.logback" % " logback-classic" % " 1.2.11"
33
- val jjwtApi = " io.jsonwebtoken" % " jjwt-api" % " 0.11.3 "
33
+ val jjwtApi = " io.jsonwebtoken" % " jjwt-api" % " 0.11.5 "
34
34
val jjwtImpl = " io.jsonwebtoken" % " jjwt-impl" % jjwtApi.revision
35
35
val jjwtJackson = " io.jsonwebtoken" % " jjwt-jackson" % jjwtApi.revision
36
36
val millVersion = Def .setting(if (scalaBinaryVersion.value == " 2.12" ) " 0.6.3" else " 0.10.4" )
You can’t perform that action at this time.
0 commit comments