Skip to content

Commit 37fe960

Browse files
committed
Upgrade backend to fix Java interop for inner classes
The upgraded backend contains a single new PR: lampepfl/scala#4 which fixes Java interop with Dotty-emitted inner classes in objects.
1 parent 6a95fef commit 37fe960

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

project/Build.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ object DottyBuild extends Build {
1919
val JENKINS_BUILD = "dotty.jenkins.build"
2020
val DRONE_MEM = "dotty.drone.mem"
2121

22-
val scalaCompiler = "me.d-d" % "scala-compiler" % "2.11.5-20160322-171045-e19b30b3cd"
22+
val scalaCompiler = "me.d-d" % "scala-compiler" % "2.11.5-20170111-125332-40bdc7b65a"
2323

2424
val agentOptions = List(
2525
// "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
@@ -45,6 +45,7 @@ object DottyBuild extends Build {
4545

4646
override def settings: Seq[Setting[_]] = {
4747
super.settings ++ Seq(
48+
resolvers += Resolver.sonatypeRepo("releases"),
4849
scalaVersion in Global := "2.11.5",
4950
version in Global := {
5051
if (isNightly)

tests/pos-java-interop/innerClass/Test.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ public static void test() {
33
Outer outer = new Outer();
44
Outer.InnerInClass innerInClass = outer.inner();
55

6-
// Does not work yet, requires https://github.com/DarkDimius/scala/pull/4
7-
// Outer.InnerInObject innerInObject = new Outer.InnerInObject();
6+
Outer.InnerInObject innerInObject = new Outer.InnerInObject();
87
}
98
}

0 commit comments

Comments
 (0)