Skip to content

Commit e93ad45

Browse files
author
Michel Davit
committed
Fix assembly
1 parent ef39b3e commit e93ad45

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
uses: olafurpg/setup-scala@v10
1818
with:
1919
java-version: 1.11.0
20-
- run: sbt test
20+
- run: sbt test assembly

build.sbt

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,21 @@ lazy val magnolifyTools = project
135135
)
136136
.dependsOn(shared)
137137

138+
ThisBuild / dependencyOverrides ++= Seq(
139+
// force jre version
140+
"com.google.guava" % "guava" % guavaVersion,
141+
// sync all jackson versions
142+
"com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion,
143+
"com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion,
144+
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,
145+
"com.fasterxml.jackson.jaxrs" % "jackson-jaxrs-base" % jacksonVersion,
146+
"com.fasterxml.jackson.jaxrs" % "jackson-jaxrs-json-provider" % jacksonVersion,
147+
"com.fasterxml.jackson.module" % "jackson-module-jaxb-annotations" % jacksonVersion,
148+
"com.fasterxml.jackson.module" % "jackson-module-paranamer" % jacksonVersion,
149+
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion,
150+
)
151+
152+
// assembly
138153
def exclude(moduleNames: String*)(
139154
dependencies: Vector[Assembly.Dependency]
140155
): Either[String, Vector[Assembly.JarEntry]] = {
@@ -173,24 +188,10 @@ lazy val discardMetaFiles = Set(
173188
"NOTICE.md"
174189
)
175190

176-
ThisBuild / dependencyOverrides ++= Seq(
177-
// force jre version
178-
"com.google.guava" % "guava" % guavaVersion,
179-
// sync all jackson versions
180-
"com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion,
181-
"com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion,
182-
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,
183-
"com.fasterxml.jackson.jaxrs" % "jackson-jaxrs-base" % jacksonVersion,
184-
"com.fasterxml.jackson.jaxrs" % "jackson-jaxrs-json-provider" % jacksonVersion,
185-
"com.fasterxml.jackson.module" % "jackson-module-jaxb-annotations" % jacksonVersion,
186-
"com.fasterxml.jackson.module" % "jackson-module-paranamer" % jacksonVersion,
187-
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion,
188-
)
189-
190191
lazy val signedMetaExtensions = Set(".DSA", ".RSA", ".SF")
191192

192193
def discardMeta(f: String): Boolean = {
193-
discardMetaFiles.contains(f) || signedMetaExtensions.exists(f.endsWith)
194+
discardMetaFiles.contains(f) || signedMetaExtensions.exists(f.endsWith) || f.endsWith(".kotlin_module")
194195
}
195196

196197
lazy val assemblySettings = Seq(

0 commit comments

Comments
 (0)