From ee88b906af4f197609744bc5e98c7b35034f8bef Mon Sep 17 00:00:00 2001 From: Luben Karavelov Date: Mon, 12 Aug 2024 16:36:58 +0100 Subject: [PATCH] Don't define `Automatic-Module-Name` in the Manifest We are already building the `module-info`. Addresses #322 --- build.sbt | 55 ------------------------------------------------------- 1 file changed, 55 deletions(-) diff --git a/build.sbt b/build.sbt index a5283aa..682a187 100644 --- a/build.sbt +++ b/build.sbt @@ -163,7 +163,6 @@ description := "JNI bindings for Zstd native library that provides fast and high "compression lossless algorithm for Java and all JVM languages." Compile / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), Package.ManifestAttributes(new java.util.jar.Attributes.Name("Bnd-LastModified") -> s"${java.lang.System.currentTimeMillis()}"), Package.ManifestAttributes(new java.util.jar.Attributes.Name("Bundle-Name") -> "zstd-jni"), Package.ManifestAttributes(new java.util.jar.Attributes.Name("Bundle-SymbolicName") -> "com.github.luben.zstd-jni"), @@ -264,9 +263,6 @@ inConfig(Linux_amd64)(Defaults.compileSettings) Linux_amd64 / packageBin / mappings := { (file(s"target/classes/linux/amd64/libzstd-jni-${version.value}.so"), s"linux/amd64/libzstd-jni-${version.value}.so") :: classes } -Linux_amd64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_amd64"), Linux_amd64 / packageBin) lazy val Linux_i386 = config("linux_i386").extend(Compile) @@ -274,9 +270,6 @@ inConfig(Linux_i386)(Defaults.compileSettings) Linux_i386 / packageBin / mappings := { (file(s"target/classes/linux/i386/libzstd-jni-${version.value}.so"), s"linux/i386/libzstd-jni-${version.value}.so") :: classes } -Linux_i386 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_i386"), Linux_i386 / packageBin) lazy val Linux_aarch64 = config("linux_aarch64").extend(Compile) @@ -284,9 +277,6 @@ inConfig(Linux_aarch64)(Defaults.compileSettings) Linux_aarch64 / packageBin / mappings := { (file(s"target/classes/linux/aarch64/libzstd-jni-${version.value}.so"), s"linux/aarch64/libzstd-jni-${version.value}.so") :: classes } -Linux_aarch64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_aarch64"), Linux_aarch64 / packageBin) lazy val Linux_arm = config("linux_arm").extend(Compile) @@ -294,9 +284,6 @@ inConfig(Linux_arm)(Defaults.compileSettings) Linux_arm / packageBin / mappings := { (file(s"target/classes/linux/arm/libzstd-jni-${version.value}.so"), s"linux/arm/libzstd-jni-${version.value}.so") :: classes } -Linux_arm / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_arm"), Linux_arm / packageBin) lazy val Linux_ppc64le = config("linux_ppc64le").extend(Compile) @@ -304,9 +291,6 @@ inConfig(Linux_ppc64le)(Defaults.compileSettings) Linux_ppc64le / packageBin / mappings := { (file(s"target/classes/linux/ppc64le/libzstd-jni-${version.value}.so"), s"linux/ppc64le/libzstd-jni-${version.value}.so") :: classes } -Linux_ppc64le / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_ppc64le"), Linux_ppc64le / packageBin) lazy val Linux_ppc64 = config("linux_ppc64").extend(Compile) @@ -314,9 +298,6 @@ inConfig(Linux_ppc64)(Defaults.compileSettings) Linux_ppc64 / packageBin / mappings := { (file(s"target/classes/linux/ppc64/libzstd-jni-${version.value}.so"), s"linux/ppc64/libzstd-jni-${version.value}.so") :: classes } -Linux_ppc64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_ppc64"), Linux_ppc64 / packageBin) lazy val Linux_mips64 = config("linux_mips64").extend(Compile) @@ -324,9 +305,6 @@ inConfig(Linux_mips64)(Defaults.compileSettings) Linux_mips64 / packageBin / mappings := { (file(s"target/classes/linux/mips64/libzstd-jni-${version.value}.so"), s"linux/mips64/libzstd-jni-${version.value}.so") :: classes } -Linux_mips64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_mips64"), Linux_mips64 / packageBin) lazy val Linux_loongarch64 = config("linux_loongarch64").extend(Compile) @@ -334,9 +312,6 @@ inConfig(Linux_loongarch64)(Defaults.compileSettings) Linux_loongarch64 / packageBin / mappings := { (file(s"target/classes/linux/loongarch64/libzstd-jni-${version.value}.so"), s"linux/loongarch64/libzstd-jni-${version.value}.so") :: classes } -Linux_loongarch64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_loongarch64"), Linux_loongarch64 / packageBin) lazy val Linux_s390x = config("linux_s390x").extend(Compile) @@ -344,9 +319,6 @@ inConfig(Linux_s390x)(Defaults.compileSettings) Linux_s390x / packageBin / mappings := { (file(s"target/classes/linux/s390x/libzstd-jni-${version.value}.so"), s"linux/s390x/libzstd-jni-${version.value}.so") :: classes } -Linux_s390x / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_s390x"), Linux_s390x / packageBin) lazy val Linux_riscv64 = config("linux_riscv64").extend(Compile) @@ -354,9 +326,6 @@ inConfig(Linux_riscv64)(Defaults.compileSettings) Linux_riscv64 / packageBin / mappings := { (file(s"target/classes/linux/riscv64/libzstd-jni-${version.value}.so"), s"linux/riscv64/libzstd-jni-${version.value}.so") :: classes } -Linux_riscv64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "linux_riscv64"), Linux_riscv64 / packageBin) /* @@ -365,9 +334,6 @@ inConfig(Aix_ppc64)(Defaults.compileSettings) mappings in (Aix_ppc64, packageBin) := { (file(s"target/classes/aix/ppc64/libzstd-jni-${version.value}.so"), s"aix/ppc64/libzstd-jni-${version.value}.so") :: classes } -packageOptions in (Aix_ppc64, packageBin) ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "aix_ppc64"), packageBin in Aix_ppc64) */ @@ -376,9 +342,6 @@ inConfig(Darwin_x86_64)(Defaults.compileSettings) Darwin_x86_64 / packageBin / mappings := { (file(s"target/classes/darwin/x86_64/libzstd-jni-${version.value}.dylib"), s"darwin/x86_64/libzstd-jni-${version.value}.dylib") :: classes } -Darwin_x86_64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "darwin_x86_64"), Darwin_x86_64 / packageBin) lazy val Darwin_aarch64 = config("darwin_aarch64").extend(Compile) @@ -386,9 +349,6 @@ inConfig(Darwin_aarch64)(Defaults.compileSettings) Darwin_aarch64 / packageBin / mappings := { (file(s"target/classes/darwin/aarch64/libzstd-jni-${version.value}.dylib"), s"darwin/aarch64/libzstd-jni-${version.value}.dylib") :: classes } -Darwin_aarch64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "darwin_aarch64"), Darwin_aarch64 / packageBin) lazy val FreeBSD_amd64 = config("freebsd_amd64").extend(Compile) @@ -396,9 +356,6 @@ inConfig(FreeBSD_amd64)(Defaults.compileSettings) FreeBSD_amd64 / packageBin / mappings := { (file(s"target/classes/freebsd/amd64/libzstd-jni-${version.value}.so"), s"freebsd/amd64/libzstd-jni-${version.value}.so") :: classes } -FreeBSD_amd64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "freebsd_amd64"), FreeBSD_amd64 / packageBin) lazy val FreeBSD_i386 = config("freebsd_i386").extend(Compile) @@ -406,9 +363,6 @@ inConfig(FreeBSD_i386)(Defaults.compileSettings) FreeBSD_i386 / packageBin / mappings := { (file(s"target/classes/freebsd/i386/libzstd-jni-${version.value}.so"), s"freebsd/i386/libzstd-jni-${version.value}.so") :: classes } -FreeBSD_i386 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "freebsd_i386"), FreeBSD_i386 / packageBin) val Win_x86 = config("win_x86").extend(Compile) @@ -416,9 +370,6 @@ inConfig(Win_x86)(Defaults.compileSettings) Win_x86 / packageBin / mappings := { (file(s"target/classes/win/x86/libzstd-jni-${version.value}.dll"), s"win/x86/libzstd-jni-${version.value}.dll") :: classes } -Win_x86 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "win_x86"), Win_x86 / packageBin) val Win_amd64 = config("win_amd64").extend(Compile) @@ -426,9 +377,6 @@ inConfig(Win_amd64)(Defaults.compileSettings) Win_amd64 / packageBin / mappings := { (file(s"target/classes/win/amd64/libzstd-jni-${version.value}.dll"), s"win/amd64/libzstd-jni-${version.value}.dll") :: classes } -Win_amd64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "win_amd64"), Win_amd64 / packageBin) val Win_aarch64 = config("win_aarch64").extend(Compile) @@ -436,7 +384,4 @@ inConfig(Win_aarch64)(Defaults.compileSettings) Win_aarch64 / packageBin / mappings := { (file(s"target/classes/win/aarch64/libzstd-jni-${version.value}.dll"), s"win/aarch64/libzstd-jni-${version.value}.dll") :: classes } -Win_aarch64 / packageBin / packageOptions ++= Seq( - Package.ManifestAttributes(new java.util.jar.Attributes.Name("Automatic-Module-Name") -> "com.github.luben.zstd_jni"), -) addArtifact(Artifact(nameValue, "win_aarch64"), Win_aarch64 / packageBin)