diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/Osgi.scala | 9 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 6 insertions, 5 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: diff --git a/project/plugins.sbt b/project/plugins.sbt index c21824baf9..02d66a16dd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.3.2" libraryDependencies += "org.pantsbuild" % "jarjar" % "1.6.0" -libraryDependencies += "biz.aQute" % "bndlib" % "1.50.0" +libraryDependencies += "biz.aQute.bnd" % "biz.aQute.bnd" % "2.4.1" |