From e2d7c7871e4e8133b1c6f8b99677589dfeb6b35c Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 27 Jan 2017 13:06:09 +0100 Subject: Upgrade backend to fix Java interop for inner classes The upgraded backend contains a single new PR: https://github.com/DarkDimius/scala/pull/4 which fixes Java interop with Dotty-emitted inner classes in objects. --- project/Build.scala | 2 +- tests/pos-java-interop/innerClass/Test.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 99a6c5077..af862817c 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -19,7 +19,7 @@ object DottyBuild extends Build { val JENKINS_BUILD = "dotty.jenkins.build" val DRONE_MEM = "dotty.drone.mem" - val scalaCompiler = "me.d-d" % "scala-compiler" % "2.11.5-20160322-171045-e19b30b3cd" + val scalaCompiler = "me.d-d" % "scala-compiler" % "2.11.5-20170111-125332-40bdc7b65a" val agentOptions = List( // "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005" diff --git a/tests/pos-java-interop/innerClass/Test.java b/tests/pos-java-interop/innerClass/Test.java index 53bb826d7..5d053195d 100644 --- a/tests/pos-java-interop/innerClass/Test.java +++ b/tests/pos-java-interop/innerClass/Test.java @@ -3,7 +3,6 @@ public class Test { Outer outer = new Outer(); Outer.InnerInClass innerInClass = outer.inner(); - // Does not work yet, requires https://github.com/DarkDimius/scala/pull/4 - // Outer.InnerInObject innerInObject = new Outer.InnerInObject(); + Outer.InnerInObject innerInObject = new Outer.InnerInObject(); } } -- cgit v1.2.3