Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1e9ce89

Browse files
committedMar 24, 2014
s/jdk8/java8 s/scala-compat-jdk8/scala-java8-compat/
Are we there yet?
1 parent a59983e commit 1e9ce89

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed
 

‎README.md

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

1111
```java
1212
import scala.concurrent.*;
13-
import static scala.compat.jdk8.JFunc.*;
13+
import static scala.compat.java8.JFunction.*;
1414

1515
class Test {
1616
private static Future<Integer> futureExample(Future<String> future, ExecutionContext ec) {
@@ -19,7 +19,7 @@ class Test {
1919
}
2020
```
2121

22-
[More Examples / Documentation](src/test/java/scala/compat/jdk8/LambdaTest.java)
22+
[More Examples / Documentation](src/test/java/scala/compat/java8/LambdaTest.java)
2323

2424
### Converters between `s.u.concurrent` and `j.u.concurrent`
2525

‎build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ snapshotScalaBinaryVersion := "2.10.4"
1010

1111
organization := "org.scala-lang.modules"
1212

13-
name := "scala-compat-jdk8"
13+
name := "scala-java8-compat"
1414

1515
// important!! must come here (why?)
1616
scalaModuleOsgiSettings
1717

18-
OsgiKeys.exportPackage := Seq(s"scala.compat.jdk8.*;version=${version.value}")
18+
OsgiKeys.exportPackage := Seq(s"scala.compat.java8.*;version=${version.value}")
1919

2020
libraryDependencies += "junit" % "junit" % "4.11" % "test"
2121

@@ -33,7 +33,7 @@ test in Test := {
3333

3434
sourceGenerators in Compile <+= sourceManaged in Compile map { dir =>
3535
def write(name: String, content: String) = {
36-
val f = dir / "java" / "scala" / "compat" / "jdk8" / s"${name}.java"
36+
val f = dir / "java" / "scala" / "compat" / "java8" / s"${name}.java"
3737
IO.write(f, content)
3838
f
3939
}
@@ -42,7 +42,7 @@ sourceGenerators in Compile <+= sourceManaged in Compile map { dir =>
4242

4343
sourceGenerators in Test <+= sourceManaged in Test map { dir =>
4444
def write(name: String, content: String) = {
45-
val f = dir / "java" / "scala" / "compat" / "jdk8" / s"${name}.java"
45+
val f = dir / "java" / "scala" / "compat" / "java8" / s"${name}.java"
4646
IO.write(f, content)
4747
f
4848
}

‎project/CodeGen.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object Type {
1717
}
1818

1919
object CodeGen {
20-
def packaging = "package scala.compat.jdk8;"
20+
def packaging = "package scala.compat.java8;"
2121
case class arity(n: Int) {
2222
val ns = (1 to n).toList
2323

‎src/test/java/scala/compat/jdk8/LambdaTest.java renamed to ‎src/test/java/scala/compat/java8/LambdaTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package scala.compat.jdk8;
4+
package scala.compat.java8;
55

66
import scala.runtime.*;
7-
import static scala.compat.jdk8.TestAPI.*;
8-
import static scala.compat.jdk8.JFunction.*;
7+
import static scala.compat.java8.TestAPI.*;
8+
import static scala.compat.java8.JFunction.*;
99
import org.junit.Test;
1010

1111
public class LambdaTest {

0 commit comments

Comments
 (0)
Please sign in to comment.