Topic/renaming cleanup

README.md

@@ -8,7 +8,7 @@ using Java 8 lambda syntax.
 
 ```java
 import scala.concurrent.*;
-import static scala.runtime.F.func;
+import static scala.runtime.jfunc.JFunc.*;
 
 class Test {
 	private static Future<Integer> futureExample(Future<String> future, ExecutionContext ec) {
@@ -17,7 +17,7 @@ class Test {
 }
 ```
 
-[More Examples / Documentation](https://github.com/retronym/java-8-function1/blob/master/src/test/java/scala/runtime/test/Test.java)
+[More Examples / Documentation](https://github.com/retronym/java-8-function1/blob/master/src/test/java/scala/runtime/jfunc/Test.java)
 
 ### Hacking
 
@@ -38,7 +38,7 @@ class Test {
 package scala.runtime;
 
 @FunctionalInterface
-public interface F1$mcII$sp extends F1 {
+public interface JFunction1$mcII$sp extends JFunction1 {
     abstract int apply$mcII$sp(int v1);
 
     default Object apply(Object s) { return (Integer) apply$mcII$sp((Integer) s); }

build.sbt

@@ -2,16 +2,16 @@ scalaVersion := "2.11.0-RC1"
 
 sourceGenerators in Compile <+= sourceManaged in Compile map { dir =>
   def write(name: String, content: String) = {
-    val f = dir / "scala" / "runtime" / s"${name}.java"
+    val f = dir / "java" / "scala" / "runtime" / "jfunc" / s"${name}.java"
     IO.write(f, content)
     f
   }
-  Seq(write("F", CodeGen.factory)) ++ (0 to 22).map(n => write("F" + n, CodeGen.fN(n))) ++ (1 to 22).map(n => write("P" + n, CodeGen.pN(n)))
+  Seq(write("JFunc", CodeGen.factory)) ++ (0 to 22).map(n => write("JFunction" + n, CodeGen.fN(n))) ++ (1 to 22).map(n => write("JProcedure" + n, CodeGen.pN(n)))
 }
 
 sourceGenerators in Test <+= sourceManaged in Test map { dir =>
   def write(name: String, content: String) = {
-    val f = dir / "scala" / "runtime" / "test" / s"${name}.java"
+    val f = dir / "java" / "scala" / "runtime" / "jfunc" / s"${name}.java"
     IO.write(f, content)
     f
   }