Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initialize Plugin introduced keys to zero like values in globalSettings #121

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/com/typesafe/sbt/osgi/Osgi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ private object Osgi {
validateAllPackagesDecidedAbout(i, e, allPackages.toList)
}

def requireCapabilityTask(): String = {
lazy val requireCapabilityTask: String = {
Option(System.getProperty("java.version"))
.map(v => v.split("[.]", 3).take(2).mkString("."))
.map(version => "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=%s))\"".format(version))
Expand Down
48 changes: 30 additions & 18 deletions 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 @@ -42,20 +44,19 @@ object SbtOsgi extends AutoPlugin {
import OsgiKeys._
Seq(
bundle := Osgi.bundleTask(
manifestHeaders.value,
additionalHeaders.value,
(Compile / dependencyClasspathAsJars).value.map(_.data) ++ (Compile / products).value,
(Compile / packageBin / artifactPath).value,
(Compile / resourceDirectories).value,
embeddedJars.value,
explodedJars.value,
failOnUndecidedPackage.value,
(Compile / sourceDirectories).value,
(Compile / packageBin / packageOptions).value,
packageWithJVMJar.value,
cacheStrategy.value,
streams.value),
Compile / sbt.Keys.packageBin := bundle.value,
manifestHeaders.value,
additionalHeaders.value,
(Compile / dependencyClasspathAsJars).value.map(_.data) ++ (Compile / products).value,
(Compile / packageBin / artifactPath).value,
(Compile / resourceDirectories).value,
embeddedJars.value,
explodedJars.value,
failOnUndecidedPackage.value,
(Compile / sourceDirectories).value,
(Compile / packageBin / packageOptions).value,
packageWithJVMJar.value,
cacheStrategy.value,
streams.value),
manifestHeaders := OsgiManifestHeaders(
bundleActivator.value,
description.value,
Expand All @@ -73,18 +74,29 @@ object SbtOsgi extends AutoPlugin {
privatePackage.value,
requireBundle.value,
requireCapability.value),
bundleActivator := None,
Compile / sbt.Keys.packageBin := bundle.value,
bundleSymbolicName := Osgi.defaultBundleSymbolicName(organization.value, normalizedName.value),
bundleVersion := version.value,
privatePackage := bundleSymbolicName(name => List(name + ".*")).value,
bundleVersion := version.value
)
}

lazy val defaultGlobalSettings: Seq[Setting[_]] = {
import OsgiKeys._
Seq(
bundle := file(""),
bundleActivator := None,
bundleSymbolicName := "",
bundleVersion := "",
bundleRequiredExecutionEnvironment := Nil,
dynamicImportPackage := Nil,
exportPackage := Nil,
importPackage := List("*"),
fragmentHost := None,
privatePackage := bundleSymbolicName(name => List(name + ".*")).value,
privatePackage := Nil,
requireBundle := Nil,
failOnUndecidedPackage := false,
requireCapability := Osgi.requireCapabilityTask(),
requireCapability := Osgi.requireCapabilityTask,
additionalHeaders := Map.empty,
embeddedJars := Nil,
explodedJars := Nil,
Expand Down
Loading