diff options
Diffstat (limited to 'src/build/bnd')
-rw-r--r-- | src/build/bnd/continuations.bnd | 5 | ||||
-rw-r--r-- | src/build/bnd/scala-actors.bnd | 2 | ||||
-rw-r--r-- | src/build/bnd/scala-compiler-doc.bnd | 7 | ||||
-rw-r--r-- | src/build/bnd/scala-compiler-interactive.bnd | 7 | ||||
-rw-r--r-- | src/build/bnd/scala-compiler.bnd | 6 | ||||
-rw-r--r-- | src/build/bnd/scala-continuations-library.bnd | 7 | ||||
-rw-r--r-- | src/build/bnd/scala-continuations-plugin.bnd | 7 | ||||
-rw-r--r-- | src/build/bnd/scala-library.bnd | 1 | ||||
-rw-r--r-- | src/build/bnd/scala-parser-combinators.bnd | 7 | ||||
-rw-r--r-- | src/build/bnd/scala-reflect.bnd | 5 | ||||
-rw-r--r-- | src/build/bnd/scala-swing.bnd | 6 | ||||
-rw-r--r-- | src/build/bnd/scala-xml.bnd | 7 |
12 files changed, 58 insertions, 9 deletions
diff --git a/src/build/bnd/continuations.bnd b/src/build/bnd/continuations.bnd deleted file mode 100644 index 748502f653..0000000000 --- a/src/build/bnd/continuations.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Bundle-Name: Scala Continuations Plugin -Bundle-SymbolicName: org.scala-lang.plugins.continuations -ver: @VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} diff --git a/src/build/bnd/scala-actors.bnd b/src/build/bnd/scala-actors.bnd index 8d0555777f..69885fc2bf 100644 --- a/src/build/bnd/scala-actors.bnd +++ b/src/build/bnd/scala-actors.bnd @@ -3,3 +3,5 @@ Bundle-SymbolicName: org.scala-lang.scala-actors ver: @VERSION@ Bundle-Version: ${ver} Export-Package: *;version=${ver} +Import-Package: scala.*;version="${range;[==,=+);${ver}}",* +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-compiler-doc.bnd b/src/build/bnd/scala-compiler-doc.bnd new file mode 100644 index 0000000000..9d6d0304d1 --- /dev/null +++ b/src/build/bnd/scala-compiler-doc.bnd @@ -0,0 +1,7 @@ +Bundle-Name: Scala Documentation Generator +Bundle-SymbolicName: org.scala-lang.modules.scala-compiler-doc_@SCALA_BINARY_VERSION@ +ver: @SCALA_COMPILER_DOC_VERSION@ +Bundle-Version: ${ver} +Export-Package: *;version=${ver} +Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-compiler-interactive.bnd b/src/build/bnd/scala-compiler-interactive.bnd new file mode 100644 index 0000000000..07e3de35b0 --- /dev/null +++ b/src/build/bnd/scala-compiler-interactive.bnd @@ -0,0 +1,7 @@ +Bundle-Name: Scala Interactive Compiler +Bundle-SymbolicName: org.scala-lang.modules.scala-compiler-interactive_@SCALA_BINARY_VERSION@ +ver: @SCALA_COMPILER_INTERACTIVE_VERSION@ +Bundle-Version: ${ver} +Export-Package: *;version=${ver} +Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-compiler.bnd b/src/build/bnd/scala-compiler.bnd index c289843447..2bd24d780d 100644 --- a/src/build/bnd/scala-compiler.bnd +++ b/src/build/bnd/scala-compiler.bnd @@ -3,6 +3,10 @@ Bundle-SymbolicName: org.scala-lang.scala-compiler ver: @VERSION@ Bundle-Version: ${ver} Export-Package: *;version=${ver} -Import-Package: scala.tools.jline.*;resolution:=optional, \ +Import-Package: jline.*;resolution:=optional, \ org.apache.tools.ant.*;resolution:=optional, \ + scala.util.parsing.*;version="${range;[====,====];@PARSER_COMBINATORS_VERSION@}";resolution:=optional, \ + scala.xml.*;version="${range;[====,====];@XML_VERSION@}";resolution:=optional, \ + scala.*;version="${range;[==,=+);${ver}}", \ * +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-continuations-library.bnd b/src/build/bnd/scala-continuations-library.bnd new file mode 100644 index 0000000000..b36718cc5b --- /dev/null +++ b/src/build/bnd/scala-continuations-library.bnd @@ -0,0 +1,7 @@ +Bundle-Name: Scala Delimited Continuations Library +Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-library +ver: @CONTINUATIONS_LIBRARY_VERSION@ +Bundle-Version: ${ver} +Export-Package: *;version=${ver} +Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-continuations-plugin.bnd b/src/build/bnd/scala-continuations-plugin.bnd new file mode 100644 index 0000000000..2f2464b452 --- /dev/null +++ b/src/build/bnd/scala-continuations-plugin.bnd @@ -0,0 +1,7 @@ +Bundle-Name: Scala Delimited Continuations Compiler Plugin +Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-plugin +ver: @CONTINUATIONS_PLUGIN_VERSION@ +Bundle-Version: ${ver} +Export-Package: *;version=${ver} +Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-library.bnd b/src/build/bnd/scala-library.bnd index 03aff45672..7eb4fa4b2a 100644 --- a/src/build/bnd/scala-library.bnd +++ b/src/build/bnd/scala-library.bnd @@ -4,3 +4,4 @@ ver: @VERSION@ Bundle-Version: ${ver} Export-Package: *;version=${ver} Import-Package: sun.misc;resolution:=optional, * +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-parser-combinators.bnd b/src/build/bnd/scala-parser-combinators.bnd new file mode 100644 index 0000000000..ef8646cbd0 --- /dev/null +++ b/src/build/bnd/scala-parser-combinators.bnd @@ -0,0 +1,7 @@ +Bundle-Name: Scala Parser Combinators Library +Bundle-SymbolicName: org.scala-lang.modules.scala-parser-combinators +ver: @PARSER_COMBINATORS_VERSION@ +Bundle-Version: ${ver} +Export-Package: *;version=${ver} +Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-reflect.bnd b/src/build/bnd/scala-reflect.bnd index 6cda346d3a..e4bc54e52e 100644 --- a/src/build/bnd/scala-reflect.bnd +++ b/src/build/bnd/scala-reflect.bnd @@ -3,4 +3,7 @@ Bundle-SymbolicName: org.scala-lang.scala-reflect ver: @VERSION@ Bundle-Version: ${ver} Export-Package: *;version=${ver} -Import-Package: scala.tools.nsc;resolution:=optional, * +Import-Package: scala.*;version="${range;[==,=+);${ver}}", \ + scala.tools.nsc;resolution:=optional;version="${range;[==,=+);${ver}}", \ + * +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-swing.bnd b/src/build/bnd/scala-swing.bnd index eeacb9bd3f..f8b50baa91 100644 --- a/src/build/bnd/scala-swing.bnd +++ b/src/build/bnd/scala-swing.bnd @@ -1,5 +1,7 @@ Bundle-Name: Scala Swing -Bundle-SymbolicName: org.scala-lang.scala-swing -ver: @VERSION@ +Bundle-SymbolicName: org.scala-lang.modules.scala-swing +ver: @SCALA_SWING_VERSION@ Bundle-Version: ${ver} Export-Package: *;version=${ver} +Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* +Bundle-RequiredExecutionEnvironment: JavaSE-1.6,JavaSE-1.7 diff --git a/src/build/bnd/scala-xml.bnd b/src/build/bnd/scala-xml.bnd new file mode 100644 index 0000000000..01bf0144eb --- /dev/null +++ b/src/build/bnd/scala-xml.bnd @@ -0,0 +1,7 @@ +Bundle-Name: Scala XML Library +Bundle-SymbolicName: org.scala-lang.modules.scala-xml +ver: @XML_VERSION@ +Bundle-Version: ${ver} +Export-Package: *;version=${ver} +Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 |