Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions tests/pos-java-interop/innerClass/Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ public static void 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();
}
}