Skip to content

Commit a5787c1

Browse files
committed
Rename scala.compat.java8.* -> dotty.runtime.function.*
This avoids clashing with the scala-java8-compat library, which could cause many issues but in particular means that sbt-assembly didn't work on a dotty project that depends on this library.
1 parent 559b94f commit a5787c1

File tree

136 files changed

+137
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+137
-137
lines changed

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,8 +1178,8 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
11781178
val arity = field.meth.tpe.widenDealias.paramTypes.size - _1.size
11791179
val returnsUnit = field.meth.tpe.widenDealias.resultType.classSymbol == UnitClass
11801180
if (returnsUnit)
1181-
ctx.requiredClass(("scala.compat.java8.JProcedure" + arity))
1182-
else ctx.requiredClass(("scala.compat.java8.JFunction" + arity))
1181+
ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
1182+
else ctx.requiredClass(("dotty.runtime.function.JFunction" + arity))
11831183
}
11841184
}
11851185
}

compiler/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class FunctionalInterfaces extends MiniPhase {
2424
def phaseName: String = FunctionalInterfaces.name
2525

2626
private[this] val functionName = "JFunction".toTermName
27-
private[this] val functionPackage = "scala.compat.java8.".toTermName
27+
private[this] val functionPackage = "dotty.runtime.function.".toTermName
2828

2929
override def transformClosure(tree: Closure)(implicit ctx: Context): Tree = {
3030
val cls = tree.tpe.widen.classSymbol.asClass

library/src/scala/compat/java8/JFunction.java renamed to library/src/dotty/runtime/function/JFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
44
*/
55

6-
package scala.compat.java8;
6+
package dotty.runtime.function;
77

88
import scala.runtime.BoxedUnit;
99

library/src/scala/compat/java8/JFunction0$mcB$sp.java renamed to library/src/dotty/runtime/function/JFunction0$mcB$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
44
*/
55

6-
package scala.compat.java8;
6+
package dotty.runtime.function;
77

88
@FunctionalInterface
99
public interface JFunction0$mcB$sp extends JFunction0 {

library/src/scala/compat/java8/JFunction0$mcC$sp.java renamed to library/src/dotty/runtime/function/JFunction0$mcC$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
44
*/
55

6-
package scala.compat.java8;
6+
package dotty.runtime.function;
77

88
@FunctionalInterface
99
public interface JFunction0$mcC$sp extends JFunction0 {

library/src/scala/compat/java8/JFunction0$mcD$sp.java renamed to library/src/dotty/runtime/function/JFunction0$mcD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
44
*/
55

6-
package scala.compat.java8;
6+
package dotty.runtime.function;
77

88
@FunctionalInterface
99
public interface JFunction0$mcD$sp extends JFunction0 {

library/src/scala/compat/java8/JFunction0$mcF$sp.java renamed to library/src/dotty/runtime/function/JFunction0$mcF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
44
*/
55

6-
package scala.compat.java8;
6+
package dotty.runtime.function;
77

88
@FunctionalInterface
99
public interface JFunction0$mcF$sp extends JFunction0 {

library/src/scala/compat/java8/JFunction0$mcI$sp.java renamed to library/src/dotty/runtime/function/JFunction0$mcI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
44
*/
55

6-
package scala.compat.java8;
6+
package dotty.runtime.function;
77

88
@FunctionalInterface
99
public interface JFunction0$mcI$sp extends JFunction0 {

library/src/scala/compat/java8/JFunction0$mcJ$sp.java renamed to library/src/dotty/runtime/function/JFunction0$mcJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
44
*/
55

6-
package scala.compat.java8;
6+
package dotty.runtime.function;
77

88
@FunctionalInterface
99
public interface JFunction0$mcJ$sp extends JFunction0 {

library/src/scala/compat/java8/JFunction0$mcS$sp.java renamed to library/src/dotty/runtime/function/JFunction0$mcS$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
44
*/
55

6-
package scala.compat.java8;
6+
package dotty.runtime.function;
77

88
@FunctionalInterface
99
public interface JFunction0$mcS$sp extends JFunction0 {

0 commit comments

Comments
 (0)