summaryrefslogtreecommitdiff
path: root/project/Osgi.scala
diff options
context:
space:
mode:
Diffstat (limited to 'project/Osgi.scala')
-rw-r--r--project/Osgi.scala9
1 files changed, 5 insertions, 4 deletions
diff --git a/project/Osgi.scala b/project/Osgi.scala
index ed961d1c27..4676119076 100644
--- a/project/Osgi.scala
+++ b/project/Osgi.scala
@@ -1,5 +1,5 @@
-import aQute.lib.osgi.Builder
-import aQute.lib.osgi.Constants._
+import aQute.bnd.osgi.Builder
+import aQute.bnd.osgi.Constants._
import java.util.Properties
import sbt._
import sbt.Keys._
@@ -29,13 +29,14 @@ object Osgi {
"Export-Package" -> ("*;version=${ver}"),
"Import-Package" -> ("scala.*;version=\"${range;[==,=+);${ver}}\",*"),
"Bundle-Version" -> v,
- "Bundle-RequiredExecutionEnvironment" -> "JavaSE-1.6, JavaSE-1.7",
+ "Bundle-RequiredExecutionEnvironment" -> "JavaSE-1.8",
"-eclipse" -> "false"
)
},
bundle <<= Def.task {
+ val res = (products in Compile in packageBin).value
bundleTask(headers.value.toMap, (products in Compile in packageBin).value,
- (artifactPath in (Compile, packageBin)).value, Nil, streams.value)
+ (artifactPath in (Compile, packageBin)).value, res, streams.value)
},
packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), bundle).identityMap,
// Also create OSGi source bundles: