Merge pull request #67 from szeiger/wip/scala-2.12.0-M4

Add support for Scala 2.12.0-M4

Author: szeiger

.travis.yml

@@ -12,8 +12,8 @@ env:
 script:
   - admin/build.sh
 scala:
-  - 2.11.7
-  - 2.12.0-M3
+  - 2.11.8
+  - 2.12.0-M4
 jdk:
   - oraclejdk8
 notifications:

build.sbt

@@ -3,16 +3,16 @@ val disableDocs = sys.props("nodocs") == "true"
 lazy val JavaDoc = config("genjavadoc") extend Compile
 
 def jwrite(dir: java.io.File)(name: String, content: String) = {
-  val f = dir / "scala" / "compat" / "java8" / s"${name}.java"
+  val f = dir / "scala" / "runtime" / "java8" / s"${name}.java"
   IO.write(f, content)
   f
 }
 
 lazy val commonSettings = Seq(
-  scalaVersion := "2.11.7",
-  crossScalaVersions := List("2.11.7", "2.12.0-M3"),
+  scalaVersion := "2.11.8",
+  crossScalaVersions := List("2.11.8", "2.12.0-M4"),
   organization := "org.scala-lang.modules",
-  version := "0.6.0-SNAPSHOT"
+  version := "0.8.0-SNAPSHOT"
 )
 
 lazy val fnGen = (project in file("fnGen")).
@@ -61,14 +61,16 @@ lazy val root = (project in file(".")).
       (out ** "*.scala").get
     }.taskValue,
 
-    sourceGenerators in Compile <+= sourceManaged in Compile map { dir =>
-      val write = jwrite(dir) _
-      Seq(write("JFunction", CodeGen.factory)) ++
-      (0 to 22).map(n => write("JFunction" + n, CodeGen.fN(n))) ++
-      (0 to 22).map(n => write("JProcedure" + n, CodeGen.pN(n))) ++
-      CodeGen.specializedF0.map(write.tupled) ++
-      CodeGen.specializedF1.map(write.tupled) ++
-      CodeGen.specializedF2.map(write.tupled)
+    sourceGenerators in Compile <+= (sourceManaged in Compile, scalaVersion) map { (dir, v) =>
+      if(v.startsWith("2.11.")) {
+        val write = jwrite(dir) _
+        Seq(write("JFunction", CodeGen.factory)) ++
+        (0 to 22).map(n => write("JFunction" + n, CodeGen.fN(n))) ++
+        (0 to 22).map(n => write("JProcedure" + n, CodeGen.pN(n))) ++
+        CodeGen.specializedF0.map(write.tupled) ++
+        CodeGen.specializedF1.map(write.tupled) ++
+        CodeGen.specializedF2.map(write.tupled)
+      } else Seq.empty
     },
 
     sourceGenerators in Test <+= sourceManaged in Test map { dir =>

project/CodeGen.scala

@@ -25,7 +25,7 @@ object Type {
 }
 
 object CodeGen {
-  def packaging = "package scala.compat.java8;"
+  def packaging = "package scala.runtime.java8;"
   case class arity(n: Int) {
     val ns = (1 to n).toList
 

src/test/java/scala/compat/java8/SpecializedTest.scala

@@ -4,7 +4,7 @@
 package scala.compat.java8
 
 import org.junit.Test
-import scala.compat.java8.SpecializedTestSupport.IntIdentity
+import scala.runtime.java8.SpecializedTestSupport.IntIdentity
 
 class SpecializedTest {
   @Test def specializationWorks() {

src/test/java/scala/compat/java8/BoxingTest.java renamed to src/test/java/scala/runtime/java8/BoxingTest.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
  */
-package scala.compat.java8;
+package scala.runtime.java8;
 
 import org.junit.Test;
 

src/test/java/scala/compat/java8/LambdaTest.java renamed to src/test/java/scala/runtime/java8/LambdaTest.java

@@ -1,14 +1,14 @@
 /*
  * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
  */
-package scala.compat.java8;
+package scala.runtime.java8;
 
 import org.apache.commons.lang3.SerializationUtils;
 import scala.runtime.*;
 
 import static junit.framework.Assert.assertEquals;
-import static scala.compat.java8.JFunction.*;
-import static scala.compat.java8.TestAPI.*;
+import static scala.runtime.java8.JFunction.*;
+import static scala.runtime.java8.TestAPI.*;
 
 import org.junit.Test;
 
@@ -99,20 +99,23 @@ public void lambdaDemo() {
         acceptFunction22Unit(   proc((v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) -> {v1.toUpperCase(); return;}));
     }
 
+    /*
+    // The JFunctions in 2.12.0-M4 are not Serializable anymore
     @Test
     public void isSerializable() {
-        scala.compat.java8.JFunction0<String> f0 = () -> "foo";
+        scala.runtime.java8.JFunction0<String> f0 = () -> "foo";
         assertEquals("foo", SerializationUtils.clone(f0).apply());
 
-        scala.compat.java8.JFunction1<String, String> f1 = (a) -> a.toUpperCase();
+        scala.runtime.java8.JFunction1<String, String> f1 = (a) -> a.toUpperCase();
         assertEquals("FOO", SerializationUtils.clone(f1).apply("foo"));
 
-        scala.compat.java8.JFunction2<String, String, String> f2 = (a, b) -> a + b;
+        scala.runtime.java8.JFunction2<String, String, String> f2 = (a, b) -> a + b;
         assertEquals("foobar", SerializationUtils.clone(f2).apply("foo", "bar"));
 
-        scala.compat.java8.JFunction3<String, String, String, String> f3 = (a, b, c) -> a + b + c;
+        scala.runtime.java8.JFunction3<String, String, String, String> f3 = (a, b, c) -> a + b + c;
         assertEquals("foobarbaz", SerializationUtils.clone(f3).apply("foo", "bar", "baz"));
     }
+    */
 
     private static scala.concurrent.Future<Integer> futureExample(
         scala.concurrent.Future<String> future, scala.concurrent.ExecutionContext ec) {

src/test/java/scala/compat/java8/SpecializedFactoryTest.java renamed to src/test/java/scala/runtime/java8/SpecializedFactoryTest.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
  */
-package scala.compat.java8;
+package scala.runtime.java8;
 
 import org.junit.Test;
 import scala.runtime.BoxedUnit;

src/test/java/scala/compat/java8/SpecializedTestSupport.java renamed to src/test/java/scala/runtime/java8/SpecializedTestSupport.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
  */
-package scala.compat.java8;
+package scala.runtime.java8;
 
 import java.util.Arrays;
 import java.util.List;