diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-06-30 12:33:07 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-07-01 11:46:29 -0700 |
| commit | 8247b8f077c96ba9a017b53de4d8062fe428c4a7 (patch) | |
| tree | 52e0fcabfe451bc5e94dbe6183bc039b2ce006c3 /versions.properties | |
| parent | d2cffb9ad2e431d62c890a7fb9d56520739e07b2 (diff) | |
| download | scala-8247b8f077c96ba9a017b53de4d8062fe428c4a7.tar.gz scala-8247b8f077c96ba9a017b53de4d8062fe428c4a7.tar.bz2 scala-8247b8f077c96ba9a017b53de4d8062fe428c4a7.zip | |
Prepare build for inclusion of java8-compat
<h1>Allow mixed builds in ant</h1>
The `JFunction` classes depend on the `FunctionN` traits, so the
Java compiler needs the Scala library on the classpath.
At the same time, while compiling the Scala library, the symbols for
`JFunction` classes need to be available to emit indy-lambda closures.
Therefore we pass the `JFunctions` as Java sources while compiling the
Scala library.
<h1>Upgrade versions of osgi tools</h1>
Set the required java version in bnd files (JavaSE-1.8).
Introduce `scala-swing.version.osgi` as a quick hack to
allow manually deriving an osgi-friendly version number
for the `scala-swing.version.number`. The latter is used
to resolve the artifact, the osgi version is just so we
can generate a bundle that osgi will accept.
Bnd 1.50 doesn't work with Java 8 classfiles, so upgrade to 2.4.1.
Also upgrade all other tools to make tests pass.
For `org.eclipse.osgi` we moved to the group ID `org.eclipse.tycho`,
where there's a newer version available. The osgi tests would fail
with the most recent version available in the `org.eclipse.osgi` groupID.
The new version of bnd only copies *classfiles* from the
original into the resulting jar, while the old version also copied
all other files. This caused osgi test failure with a `NoClassDefFound`,
which was really due to a `NumberFormatException` in `ScalaVersion`,
as it couldn't find the properties file to parse the version in...
Include resources from source jar into osgi bundle as follows:
```
Include-Resource: @@SOURCE_JARNAME@
```
This makes bnd copy all resources from the source jar. I ran the
following on the osgi artifacts of this branch, and on 2.11.x:
```
for f in `find build/osgi -name '*.jar' -a -not -name '*src.jar'`; do unzip -l $f | grep -v '\.class' ; done
```
Comparing the two file lists, things look OK:
https://gist.github.com/lrytz/be08db051a53eded192d
Diffstat (limited to 'versions.properties')
| -rw-r--r-- | versions.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/versions.properties b/versions.properties index 5fd2ac4b71..ad3d659aee 100644 --- a/versions.properties +++ b/versions.properties @@ -25,6 +25,7 @@ scala.binary.version=2.12.0-M1 scala-xml.version.number=1.0.4 scala-parser-combinators.version.number=1.0.4 scala-swing.version.number=2.0.0-M2 +scala-swing.version.osgi=2.0.0.M2 jline.version=2.12.1 scala-asm.version=5.0.4-scala-2 |