diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-06-30 09:23:59 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-07-01 11:51:33 -0700 |
| commit | c58f4e4a85ddf9a6d9441b94b1acdccab2d105b4 (patch) | |
| tree | 3ebf52e6de40586bafd8bad79536b1b0eac9bfd2 /build.xml | |
| parent | 8247b8f077c96ba9a017b53de4d8062fe428c4a7 (diff) | |
| download | scala-c58f4e4a85ddf9a6d9441b94b1acdccab2d105b4.tar.gz scala-c58f4e4a85ddf9a6d9441b94b1acdccab2d105b4.tar.bz2 scala-c58f4e4a85ddf9a6d9441b94b1acdccab2d105b4.zip | |
Include sources for scala-java8-compat instead of jar
This reverts commit e1895d64f87dc3c699a3ccbc8a3143b18d3b5bb1,
titled "Add scala-java8-compat to scala-library.jar".
Move SAM functions and `LambdaDeserializer` (from scala/scala-java8-compat@9253ed9)
into `scala.runtime.java8` package under `src/library`.
(The package name is the only diff -- they were in `scala.compat.java8` before).
The original LambdaDeserializer:
https://github.com/scala/scala-java8-compat/blob/c0732e6/src/main/java/scala/compat/java8/runtime/LambdaDeserializer.scala
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 38 |
1 files changed, 0 insertions, 38 deletions
@@ -265,11 +265,6 @@ TODO: --> <if><not><isset property="maven-deps-done"></isset></not><then> <mkdir dir="${user.home}/.m2/repository"/> - - <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/> - <artifact:remoteRepository id="sonatype-snapshots" url="https://oss.sonatype.org/content/repositories/snapshots"/> - <artifact:remoteRepository id="extra-repo" url="${extra.repo.url}"/> - <!-- This task has an issue where if the user directory does not exist, so we create it above. UGH. --> <artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset"> <dependency groupId="biz.aQute.bnd" artifactId="biz.aQute.bnd" version="2.4.1"/> @@ -314,36 +309,6 @@ TODO: <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/> <artifact:remoteRepository id="extra-repo" url="${extra.repo.url}"/> - <!-- scala-java8-compat, used by the experimental -target jvm-1.8 support. --> - <if><isset property="scala-java8-compat.package"/><then> - <property name="scala-java8-compat.version" value="0.5.0"/> - <property name="scala-java8-compat.binary.version" value="2.11"/> - <artifact:dependencies pathId="scala-java8-compat.classpath" filesetId="scala-java8-compat.fileset"> - <dependency groupId="org.scala-lang.modules" artifactId="scala-java8-compat_${scala-java8-compat.binary.version}" version="${scala-java8-compat.version}"> - <exclusion groupId="org.scala-lang" artifactId="scala-library"/> - </dependency> - </artifact:dependencies> - <property name="scala-java8-compat-classes" value="${build-quick.dir}/scala-java8-compat"/> - <delete dir="${scala-java8-compat-classes}"/> - <unzip dest="${scala-java8-compat-classes}"> - <fileset refid="scala-java8-compat.fileset"/> - <patternset> - <include name="**/*.class"/> - </patternset> - </unzip> - <path id="scala-java8-compat.libs"> - <pathelement location="${scala-java8-compat-classes}"/> - </path> - <fileset id="scala-java8-compat.fileset" dir="${scala-java8-compat-classes}"> - <include name="**/*"/> - </fileset> - </then> - <else> - <path id="scala-java8-compat.libs"/> - <fileset id="scala-java8-compat.fileset" dir="." excludes="**"/> - </else> - </if> - <!-- prepare, for each of the names below, the property "@{name}.cross", set to the necessary cross suffix (usually something like "_2.11.0-M6". --> <prepareCross name="scala-xml" /> @@ -722,7 +687,6 @@ TODO: <pathelement location="${build-locker.dir}/classes/library"/> <path refid="forkjoin.classpath"/> <path refid="aux.libs"/> - <path refid="scala-java8-compat.libs"/> </path> <path id="locker.reflect.build.path"> @@ -744,7 +708,6 @@ TODO: <pathelement location="${build-quick.dir}/classes/library"/> <path refid="forkjoin.classpath"/> <path refid="aux.libs"/> - <path refid="scala-java8-compat.libs"/> </path> <path id="quick.reflect.build.path"> @@ -837,7 +800,6 @@ TODO: <path id="pack.library.files"> <fileset dir="${build-quick.dir}/classes/library"/> <fileset dir="${forkjoin-classes}"/> - <fileset refid="scala-java8-compat.fileset"/> </path> <path id="pack.repl-jline.files"> <fileset dir="${build-quick.dir}/classes/repl-jline"/> </path> |