From 780abdd8b177672c8e1a23792f3b72c586765b72 Mon Sep 17 00:00:00 2001 From: Romain Reuillon Date: Wed, 6 Sep 2023 15:16:50 +0200 Subject: [PATCH 1/2] Fix make sure the package does not override the bundle --- src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala b/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala index b0dbcf7..3c656dd 100644 --- a/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala +++ b/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala @@ -45,7 +45,7 @@ object SbtOsgi extends AutoPlugin { manifestHeaders.value, additionalHeaders.value, (dependencyClasspathAsJars in Compile).value.map(_.data) ++ (products in Compile).value, - (artifactPath in (Compile, packageBin)).value, + (Compile / sbt.Keys.`package`).value, (resourceDirectories in Compile).value, embeddedJars.value, explodedJars.value, From d26ee1ee08e416f6e72774af0fd712216157de2e Mon Sep 17 00:00:00 2001 From: Romain Reuillon Date: Mon, 25 Sep 2023 14:50:01 +0200 Subject: [PATCH 2/2] Redefine package task --- src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala b/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala index 3c656dd..acaf25a 100644 --- a/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala +++ b/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala @@ -45,7 +45,7 @@ object SbtOsgi extends AutoPlugin { manifestHeaders.value, additionalHeaders.value, (dependencyClasspathAsJars in Compile).value.map(_.data) ++ (products in Compile).value, - (Compile / sbt.Keys.`package`).value, + (artifactPath in (Compile, packageBin)).value, (resourceDirectories in Compile).value, embeddedJars.value, explodedJars.value, @@ -53,6 +53,7 @@ object SbtOsgi extends AutoPlugin { (sourceDirectories in Compile).value, (packageOptions in (Compile, packageBin)).value, streams.value), + Compile / sbt.Keys.packageBin := bundle.value, manifestHeaders := OsgiManifestHeaders( bundleActivator.value, description.value,