aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2017-01-27 13:06:09 +0100
committerGuillaume Martres <smarter@ubuntu.com>2017-01-27 13:36:24 +0100
commite2d7c7871e4e8133b1c6f8b99677589dfeb6b35c (patch)
tree7610086c9b49206ecdd5dca40bec8e7d1c6bf051
parent6a95fef182f23a610a4e80dfd9bfcbf23364f0ee (diff)
downloaddotty-e2d7c7871e4e8133b1c6f8b99677589dfeb6b35c.tar.gz
dotty-e2d7c7871e4e8133b1c6f8b99677589dfeb6b35c.tar.bz2
dotty-e2d7c7871e4e8133b1c6f8b99677589dfeb6b35c.zip
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.
-rw-r--r--project/Build.scala2
-rw-r--r--tests/pos-java-interop/innerClass/Test.java3
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();
}
}