Skip to content

Commit 9f5fe46

Browse files
committed
Merge pull request #3 from retronym/topic/renaming-cleanup
Topic/renaming cleanup
2 parents a1ffdc2 + a678b91 commit 9f5fe46

File tree

4 files changed

+197
-186
lines changed

4 files changed

+197
-186
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using Java 8 lambda syntax.
88

99
```java
1010
import scala.concurrent.*;
11-
import static scala.runtime.F.func;
11+
import static scala.runtime.jfunc.JFunc.*;
1212

1313
class Test {
1414
private static Future<Integer> futureExample(Future<String> future, ExecutionContext ec) {
@@ -17,7 +17,7 @@ class Test {
1717
}
1818
```
1919

20-
[More Examples / Documentation](https://github.com/retronym/java-8-function1/blob/master/src/test/java/scala/runtime/test/Test.java)
20+
[More Examples / Documentation](https://github.com/retronym/java-8-function1/blob/master/src/test/java/scala/runtime/jfunc/Test.java)
2121

2222
### Hacking
2323

@@ -38,7 +38,7 @@ class Test {
3838
package scala.runtime;
3939

4040
@FunctionalInterface
41-
public interface F1$mcII$sp extends F1 {
41+
public interface JFunction1$mcII$sp extends JFunction1 {
4242
abstract int apply$mcII$sp(int v1);
4343

4444
default Object apply(Object s) { return (Integer) apply$mcII$sp((Integer) s); }

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ scalaVersion := "2.11.0-RC1"
22

33
sourceGenerators in Compile <+= sourceManaged in Compile map { dir =>
44
def write(name: String, content: String) = {
5-
val f = dir / "scala" / "runtime" / s"${name}.java"
5+
val f = dir / "java" / "scala" / "runtime" / "jfunc" / s"${name}.java"
66
IO.write(f, content)
77
f
88
}
9-
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)))
9+
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)))
1010
}
1111

1212
sourceGenerators in Test <+= sourceManaged in Test map { dir =>
1313
def write(name: String, content: String) = {
14-
val f = dir / "scala" / "runtime" / "test" / s"${name}.java"
14+
val f = dir / "java" / "scala" / "runtime" / "jfunc" / s"${name}.java"
1515
IO.write(f, content)
1616
f
1717
}

0 commit comments

Comments
 (0)