Skip to content

Commit b0adb4c

Browse files
Move module name modification and change to root package export
`-` is not a vaild character for module names
1 parent 76f7696 commit b0adb4c

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

build.sbt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ ThisBuild / scmInfo :=
2121
)
2222
)
2323

24-
ThisBuild / packageOptions += Package.ManifestAttributes(
25-
"Automatic-Module-Name" -> s"${OsgiKeys.bundleSymbolicName}"
26-
)
27-
2824
ThisBuild / developers :=
2925
List(
3026
Developer(
@@ -130,6 +126,9 @@ lazy val msgpackCore = Project(id = "msgpack-core", base = file("msgpack-core"))
130126
"org.msgpack.value.impl"
131127
),
132128
OsgiKeys.importPackage := Seq("!android.os", "!sun.*"),
129+
packageOptions += Package.ManifestAttributes(
130+
"Automatic-Module-Name" -> OsgiKeys.exportPackage.value.head
131+
),
133132
testFrameworks += new TestFramework("wvlet.airspec.Framework"),
134133
Test / javaOptions ++=
135134
Seq(
@@ -164,6 +163,9 @@ lazy val msgpackJackson = Project(id = "msgpack-jackson", base = file("msgpack-j
164163
description := "Jackson extension that adds support for MessagePack",
165164
OsgiKeys.bundleSymbolicName := "org.msgpack.msgpack-jackson",
166165
OsgiKeys.exportPackage := Seq("org.msgpack.jackson", "org.msgpack.jackson.dataformat"),
166+
packageOptions += Package.ManifestAttributes(
167+
"Automatic-Module-Name" -> OsgiKeys.exportPackage.value.head
168+
),
167169
libraryDependencies ++=
168170
Seq(
169171
"com.fasterxml.jackson.core" % "jackson-databind" % "2.20.0",

0 commit comments

Comments
 (0)