Use scala 2.10.4 to compile on JDK8
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Thu, 30 Oct 2014 20:46:27 +0100
changeset 4089a439a79c6d0
parent 407 e1439046d96e
child 409 40cabcdcd2be
Use scala 2.10.4 to compile on JDK8
samples/effectivelist/build.xml
samples/effectivelist/nbproject/build-impl.xml
samples/libs/build.xml
     1.1 --- a/samples/effectivelist/build.xml	Sun Oct 06 22:05:14 2013 +0200
     1.2 +++ b/samples/effectivelist/build.xml	Thu Oct 30 20:46:27 2014 +0100
     1.3 @@ -6,7 +6,7 @@
     1.4      <description>Builds, tests, and runs the project Effective List.</description>
     1.5      
     1.6      <ant dir="../libs" target="scala"/>
     1.7 -    <property name="scala.home" location="../libs/dist/scala-2.9.2"/>
     1.8 +    <property name="scala.home" location="../libs/dist/scala-2.10.4"/>
     1.9      
    1.10      <import file="nbproject/build-impl.xml"/>
    1.11  
     2.1 --- a/samples/effectivelist/nbproject/build-impl.xml	Sun Oct 06 22:05:14 2013 +0200
     2.2 +++ b/samples/effectivelist/nbproject/build-impl.xml	Thu Oct 30 20:46:27 2014 +0100
     2.3 @@ -50,6 +50,7 @@
     2.4          <taskdef resource="scala/tools/ant/antlib.xml">
     2.5              <classpath>
     2.6                  <pathelement location="${scala.compiler}"/>
     2.7 +                <pathelement location="${scala.compiler}/../scala-reflect.jar"/>
     2.8                  <pathelement location="${scala.library}"/>
     2.9              </classpath>
    2.10          </taskdef>
     3.1 --- a/samples/libs/build.xml	Sun Oct 06 22:05:14 2013 +0200
     3.2 +++ b/samples/libs/build.xml	Thu Oct 30 20:46:27 2014 +0100
     3.3 @@ -43,14 +43,14 @@
     3.4          </antcall>
     3.5      </target>
     3.6      
     3.7 -    <property name="scala.url" value="http://www.scala-lang.org/files/archive/scala-2.9.2.tgz"/>
     3.8 -    <property name="scala.home" location="${ant.libraries.file}/../dist/scala-2.9.2"/>
     3.9 +    <property name="scala.url" value="http://www.scala-lang.org/files/archive/scala-2.10.4.tgz"/>
    3.10 +    <property name="scala.home" location="${ant.libraries.file}/../dist/scala-2.10.4"/>
    3.11      <available file="${scala.home}/bin/scalac" property="scala.available"/>
    3.12      <target name="scala" unless="scala.available">
    3.13          <mkdir dir="dist"/>
    3.14 -        <get dest="dist/scala.tgz" src="${scala.url}" skipexisting="true"/>
    3.15 +        <get dest="dist/scala10.tgz" src="${scala.url}" skipexisting="true"/>
    3.16          <mkdir dir="${scala.home}"/>
    3.17 -        <untar compression="gzip" src="dist/scala.tgz" dest="${scala.home}/.."/>
    3.18 +        <untar compression="gzip" src="dist/scala10.tgz" dest="${scala.home}/.."/>
    3.19          <fail message="Can't find ${scala.home}/bin/scalac">
    3.20              <condition>
    3.21                  <not>