Skip to content

Commit

Permalink
Move plugin introduced keys into globalSettings
Browse files Browse the repository at this point in the history
  • Loading branch information
mdedetrich committed Jan 25, 2024
1 parent bddf019 commit 63140e3
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ object SbtOsgi extends AutoPlugin {

override lazy val projectSettings: Seq[Def.Setting[_]] = defaultOsgiSettings

override lazy val globalSettings: Seq[Def.Setting[_]] = defaultGlobalSettings

object autoImport {
type OsgiManifestHeaders = com.typesafe.sbt.osgi.OsgiManifestHeaders

Expand All @@ -39,6 +41,11 @@ object SbtOsgi extends AutoPlugin {
}

lazy val defaultOsgiSettings: Seq[Setting[_]] = {
import OsgiKeys._
Seq(Compile / sbt.Keys.packageBin := bundle.value)
}

lazy val defaultGlobalSettings: Seq[Setting[_]] = {
import OsgiKeys._
Seq(
bundle := Osgi.bundleTask(
Expand All @@ -55,7 +62,6 @@ object SbtOsgi extends AutoPlugin {
packageWithJVMJar.value,
cacheStrategy.value,
streams.value),
Compile / sbt.Keys.packageBin := bundle.value,
manifestHeaders := OsgiManifestHeaders(
bundleActivator.value,
description.value,
Expand Down

0 comments on commit 63140e3

Please sign in to comment.