diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-19 14:12:13 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-21 11:23:03 +0200 |
| commit | e4c2d68fcf2aebe062faf2bdad08e07704b66d9a (patch) | |
| tree | 5e1ba660b36a285e50652883bca96e7514fe592b /project/Osgi.scala | |
| parent | b3283669e05dc706274e944ffd3750892c16e4dd (diff) | |
| parent | aaf7bc0b948ee073934885f8240193a4ba2b3bb8 (diff) | |
| download | scala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.tar.gz scala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.tar.bz2 scala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.zip | |
Merge commit 'aaf7bc0' into merge-2.11-to-2.12-june-19
Diffstat (limited to 'project/Osgi.scala')
| -rw-r--r-- | project/Osgi.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/Osgi.scala b/project/Osgi.scala index 9b00379760..4177251aa4 100644 --- a/project/Osgi.scala +++ b/project/Osgi.scala @@ -28,8 +28,8 @@ object Osgi { "Bundle-Name" -> bundleName.value, "Bundle-SymbolicName" -> bundleSymbolicName.value, "ver" -> v, - "Export-Package" -> ("*;version=${ver}"), - "Import-Package" -> ("scala.*;version=\"${range;[==,=+);${ver}}\",*"), + "Export-Package" -> "*;version=${ver};-split-package:=merge-first", + "Import-Package" -> "scala.*;version=\"${range;[==,=+);${ver}}\",*", "Bundle-Version" -> v, "Bundle-RequiredExecutionEnvironment" -> "JavaSE-1.8", "-eclipse" -> "false" |