diff options
| author | Tobias Roeser <le.petit.fou@web.de> | 2014-04-23 19:35:01 +0200 |
|---|---|---|
| committer | Tobias Roeser <le.petit.fou@web.de> | 2014-04-30 13:53:28 +0200 |
| commit | 5679159827afbb34fac272d3b71824e43da2705c (patch) | |
| tree | f216e15e07ca3442e70c2b46a5a15e8006c58529 /build-ant-macros.xml | |
| parent | aa3a3dd6a420f57b0fe815bfcb2b23fbb4284468 (diff) | |
| download | scala-5679159827afbb34fac272d3b71824e43da2705c.tar.gz scala-5679159827afbb34fac272d3b71824e43da2705c.tar.bz2 scala-5679159827afbb34fac272d3b71824e43da2705c.zip | |
Restrict Import-Package for scala.*
Restrict the Import-Package OSGi manifest entry to match only binary compatible scala.* packages. This is necessary, because the Scala OSGi versions do not match the OSGi semantic versioning policy and are not binary compatible between their OSGi minor versions. This means that e.g. the scala-compiler-2.11 bundle will never work if it imports a scala.* package from 2.10 or 2.12. Thus this patch enforces a tight version range, only accepting versions within the same minor version. E.g. Applied to version 2.11.1 the range would expand to "[2.11,2.12)".
Additionally, a Java 6 execution environment will be enforced for OSGi.
All module bundles need to have their own version numbers. This was not the case before this commit. Although these module bundles were only build for testing, they are needed to be correct, now, that we have stricter package import constraints and some test cases rely on them.
Diffstat (limited to 'build-ant-macros.xml')
| -rw-r--r-- | build-ant-macros.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index 816a18b13f..383dba8aff 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -435,6 +435,11 @@ <filter token="SCALA_FULL_VERSION" value="${scala.full.version}"/> <filter token="SCALA_COMPILER_DOC_VERSION" value="${scala-compiler-doc.version.number}"/> <filter token="SCALA_COMPILER_INTERACTIVE_VERSION" value="${scala-compiler-interactive.version.number}"/> + <filter token="XML_VERSION" value="${scala-xml.version.number}" /> + <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" /> + <filter token="CONTINUATIONS_PLUGIN_VERSION" value="${scala-continuations-plugin.version.number}" /> + <filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" /> + <filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" /> </filterset> </copy> <bnd classpath="${@{project}.jar}" eclipse="false" failok="false" exceptions="true" files="${build-osgi.dir}/${@{project}.name}.bnd" output="${build-osgi.dir}"/> |