Skip to content

Commit ee88b90

Browse files
committed
Don't define Automatic-Module-Name in the Manifest
We are already building the `module-info`. Addresses #322
1 parent 76acf0f commit ee88b90

File tree

1 file changed

+0
-55
lines changed

1 file changed

+0
-55
lines changed

build.sbt

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ description := "JNI bindings for Zstd native library that provides fast and high
163163
"compression lossless algorithm for Java and all JVM languages."
164164

165165
Compile / packageBin / packageOptions ++= Seq(
166-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
167166
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Bnd-LastModified") -> s"${java.lang.System.currentTimeMillis()}"),
168167
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Bundle-Name") -> "zstd-jni"),
169168
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Bundle-SymbolicName") -> "com.github.luben.zstd-jni"),
@@ -264,99 +263,69 @@ inConfig(Linux_amd64)(Defaults.compileSettings)
264263
Linux_amd64 / packageBin / mappings := {
265264
(file(s"target/classes/linux/amd64/libzstd-jni-${version.value}.so"), s"linux/amd64/libzstd-jni-${version.value}.so") :: classes
266265
}
267-
Linux_amd64 / packageBin / packageOptions ++= Seq(
268-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
269-
)
270266
addArtifact(Artifact(nameValue, "linux_amd64"), Linux_amd64 / packageBin)
271267

272268
lazy val Linux_i386 = config("linux_i386").extend(Compile)
273269
inConfig(Linux_i386)(Defaults.compileSettings)
274270
Linux_i386 / packageBin / mappings := {
275271
(file(s"target/classes/linux/i386/libzstd-jni-${version.value}.so"), s"linux/i386/libzstd-jni-${version.value}.so") :: classes
276272
}
277-
Linux_i386 / packageBin / packageOptions ++= Seq(
278-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
279-
)
280273
addArtifact(Artifact(nameValue, "linux_i386"), Linux_i386 / packageBin)
281274

282275
lazy val Linux_aarch64 = config("linux_aarch64").extend(Compile)
283276
inConfig(Linux_aarch64)(Defaults.compileSettings)
284277
Linux_aarch64 / packageBin / mappings := {
285278
(file(s"target/classes/linux/aarch64/libzstd-jni-${version.value}.so"), s"linux/aarch64/libzstd-jni-${version.value}.so") :: classes
286279
}
287-
Linux_aarch64 / packageBin / packageOptions ++= Seq(
288-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
289-
)
290280
addArtifact(Artifact(nameValue, "linux_aarch64"), Linux_aarch64 / packageBin)
291281

292282
lazy val Linux_arm = config("linux_arm").extend(Compile)
293283
inConfig(Linux_arm)(Defaults.compileSettings)
294284
Linux_arm / packageBin / mappings := {
295285
(file(s"target/classes/linux/arm/libzstd-jni-${version.value}.so"), s"linux/arm/libzstd-jni-${version.value}.so") :: classes
296286
}
297-
Linux_arm / packageBin / packageOptions ++= Seq(
298-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
299-
)
300287
addArtifact(Artifact(nameValue, "linux_arm"), Linux_arm / packageBin)
301288

302289
lazy val Linux_ppc64le = config("linux_ppc64le").extend(Compile)
303290
inConfig(Linux_ppc64le)(Defaults.compileSettings)
304291
Linux_ppc64le / packageBin / mappings := {
305292
(file(s"target/classes/linux/ppc64le/libzstd-jni-${version.value}.so"), s"linux/ppc64le/libzstd-jni-${version.value}.so") :: classes
306293
}
307-
Linux_ppc64le / packageBin / packageOptions ++= Seq(
308-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
309-
)
310294
addArtifact(Artifact(nameValue, "linux_ppc64le"), Linux_ppc64le / packageBin)
311295

312296
lazy val Linux_ppc64 = config("linux_ppc64").extend(Compile)
313297
inConfig(Linux_ppc64)(Defaults.compileSettings)
314298
Linux_ppc64 / packageBin / mappings := {
315299
(file(s"target/classes/linux/ppc64/libzstd-jni-${version.value}.so"), s"linux/ppc64/libzstd-jni-${version.value}.so") :: classes
316300
}
317-
Linux_ppc64 / packageBin / packageOptions ++= Seq(
318-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
319-
)
320301
addArtifact(Artifact(nameValue, "linux_ppc64"), Linux_ppc64 / packageBin)
321302

322303
lazy val Linux_mips64 = config("linux_mips64").extend(Compile)
323304
inConfig(Linux_mips64)(Defaults.compileSettings)
324305
Linux_mips64 / packageBin / mappings := {
325306
(file(s"target/classes/linux/mips64/libzstd-jni-${version.value}.so"), s"linux/mips64/libzstd-jni-${version.value}.so") :: classes
326307
}
327-
Linux_mips64 / packageBin / packageOptions ++= Seq(
328-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
329-
)
330308
addArtifact(Artifact(nameValue, "linux_mips64"), Linux_mips64 / packageBin)
331309

332310
lazy val Linux_loongarch64 = config("linux_loongarch64").extend(Compile)
333311
inConfig(Linux_loongarch64)(Defaults.compileSettings)
334312
Linux_loongarch64 / packageBin / mappings := {
335313
(file(s"target/classes/linux/loongarch64/libzstd-jni-${version.value}.so"), s"linux/loongarch64/libzstd-jni-${version.value}.so") :: classes
336314
}
337-
Linux_loongarch64 / packageBin / packageOptions ++= Seq(
338-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
339-
)
340315
addArtifact(Artifact(nameValue, "linux_loongarch64"), Linux_loongarch64 / packageBin)
341316

342317
lazy val Linux_s390x = config("linux_s390x").extend(Compile)
343318
inConfig(Linux_s390x)(Defaults.compileSettings)
344319
Linux_s390x / packageBin / mappings := {
345320
(file(s"target/classes/linux/s390x/libzstd-jni-${version.value}.so"), s"linux/s390x/libzstd-jni-${version.value}.so") :: classes
346321
}
347-
Linux_s390x / packageBin / packageOptions ++= Seq(
348-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
349-
)
350322
addArtifact(Artifact(nameValue, "linux_s390x"), Linux_s390x / packageBin)
351323

352324
lazy val Linux_riscv64 = config("linux_riscv64").extend(Compile)
353325
inConfig(Linux_riscv64)(Defaults.compileSettings)
354326
Linux_riscv64 / packageBin / mappings := {
355327
(file(s"target/classes/linux/riscv64/libzstd-jni-${version.value}.so"), s"linux/riscv64/libzstd-jni-${version.value}.so") :: classes
356328
}
357-
Linux_riscv64 / packageBin / packageOptions ++= Seq(
358-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
359-
)
360329
addArtifact(Artifact(nameValue, "linux_riscv64"), Linux_riscv64 / packageBin)
361330

362331
/*
@@ -365,9 +334,6 @@ inConfig(Aix_ppc64)(Defaults.compileSettings)
365334
mappings in (Aix_ppc64, packageBin) := {
366335
(file(s"target/classes/aix/ppc64/libzstd-jni-${version.value}.so"), s"aix/ppc64/libzstd-jni-${version.value}.so") :: classes
367336
}
368-
packageOptions in (Aix_ppc64, packageBin) ++= Seq(
369-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
370-
)
371337
addArtifact(Artifact(nameValue, "aix_ppc64"), packageBin in Aix_ppc64)
372338
*/
373339

@@ -376,67 +342,46 @@ inConfig(Darwin_x86_64)(Defaults.compileSettings)
376342
Darwin_x86_64 / packageBin / mappings := {
377343
(file(s"target/classes/darwin/x86_64/libzstd-jni-${version.value}.dylib"), s"darwin/x86_64/libzstd-jni-${version.value}.dylib") :: classes
378344
}
379-
Darwin_x86_64 / packageBin / packageOptions ++= Seq(
380-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
381-
)
382345
addArtifact(Artifact(nameValue, "darwin_x86_64"), Darwin_x86_64 / packageBin)
383346

384347
lazy val Darwin_aarch64 = config("darwin_aarch64").extend(Compile)
385348
inConfig(Darwin_aarch64)(Defaults.compileSettings)
386349
Darwin_aarch64 / packageBin / mappings := {
387350
(file(s"target/classes/darwin/aarch64/libzstd-jni-${version.value}.dylib"), s"darwin/aarch64/libzstd-jni-${version.value}.dylib") :: classes
388351
}
389-
Darwin_aarch64 / packageBin / packageOptions ++= Seq(
390-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
391-
)
392352
addArtifact(Artifact(nameValue, "darwin_aarch64"), Darwin_aarch64 / packageBin)
393353

394354
lazy val FreeBSD_amd64 = config("freebsd_amd64").extend(Compile)
395355
inConfig(FreeBSD_amd64)(Defaults.compileSettings)
396356
FreeBSD_amd64 / packageBin / mappings := {
397357
(file(s"target/classes/freebsd/amd64/libzstd-jni-${version.value}.so"), s"freebsd/amd64/libzstd-jni-${version.value}.so") :: classes
398358
}
399-
FreeBSD_amd64 / packageBin / packageOptions ++= Seq(
400-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
401-
)
402359
addArtifact(Artifact(nameValue, "freebsd_amd64"), FreeBSD_amd64 / packageBin)
403360

404361
lazy val FreeBSD_i386 = config("freebsd_i386").extend(Compile)
405362
inConfig(FreeBSD_i386)(Defaults.compileSettings)
406363
FreeBSD_i386 / packageBin / mappings := {
407364
(file(s"target/classes/freebsd/i386/libzstd-jni-${version.value}.so"), s"freebsd/i386/libzstd-jni-${version.value}.so") :: classes
408365
}
409-
FreeBSD_i386 / packageBin / packageOptions ++= Seq(
410-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
411-
)
412366
addArtifact(Artifact(nameValue, "freebsd_i386"), FreeBSD_i386 / packageBin)
413367

414368
val Win_x86 = config("win_x86").extend(Compile)
415369
inConfig(Win_x86)(Defaults.compileSettings)
416370
Win_x86 / packageBin / mappings := {
417371
(file(s"target/classes/win/x86/libzstd-jni-${version.value}.dll"), s"win/x86/libzstd-jni-${version.value}.dll") :: classes
418372
}
419-
Win_x86 / packageBin / packageOptions ++= Seq(
420-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
421-
)
422373
addArtifact(Artifact(nameValue, "win_x86"), Win_x86 / packageBin)
423374

424375
val Win_amd64 = config("win_amd64").extend(Compile)
425376
inConfig(Win_amd64)(Defaults.compileSettings)
426377
Win_amd64 / packageBin / mappings := {
427378
(file(s"target/classes/win/amd64/libzstd-jni-${version.value}.dll"), s"win/amd64/libzstd-jni-${version.value}.dll") :: classes
428379
}
429-
Win_amd64 / packageBin / packageOptions ++= Seq(
430-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
431-
)
432380
addArtifact(Artifact(nameValue, "win_amd64"), Win_amd64 / packageBin)
433381

434382
val Win_aarch64 = config("win_aarch64").extend(Compile)
435383
inConfig(Win_aarch64)(Defaults.compileSettings)
436384
Win_aarch64 / packageBin / mappings := {
437385
(file(s"target/classes/win/aarch64/libzstd-jni-${version.value}.dll"), s"win/aarch64/libzstd-jni-${version.value}.dll") :: classes
438386
}
439-
Win_aarch64 / packageBin / packageOptions ++= Seq(
440-
Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"),
441-
)
442387
addArtifact(Artifact(nameValue, "win_aarch64"), Win_aarch64 / packageBin)

0 commit comments

Comments
 (0)