Permalink
Browse files

Update sbt.latest.version to sbt's latest version.

And tweak deprecated stub so it compiles with 0.12.2.
  • Loading branch information...
1 parent c964643 commit cab476299d90e8c9ea592c6bcdd1aa8ee3efd9c3 @paulp paulp committed Mar 13, 2013
Showing with 5 additions and 3 deletions.
  1. +2 −1 build.xml
  2. +3 −2 src/interactive/scala/tools/nsc/interactive/RangePositions.scala
View
@@ -1986,7 +1986,7 @@ SBT Compiler Interface
<target name="sbt.start" depends="init">
<!-- TODO - Put this in init? Allow this to be overriden simply -->
- <property name="sbt.latest.version" value="0.12.0"/>
+ <property name="sbt.latest.version" value="0.12.2"/>
<property name="sbt.src.dir" value="${build-sbt.dir}/${sbt.latest.version}/src"/>
@@ -2034,6 +2034,7 @@ SBT Compiler Interface
<pathelement location="${build-quick.dir}/classes/reflect"/>
<pathelement location="${build-quick.dir}/classes/compiler"/>
<pathelement location="${build-quick.dir}/classes/scaladoc"/>
+ <pathelement location="${build-quick.dir}/classes/interactive"/>
<pathelement location="${build-quick.dir}/classes/repl"/>
<pathelement location="${sbt.interface.jar}"/>
<path refid="forkjoin.classpath"/>
@@ -7,8 +7,9 @@ package scala.tools.nsc
package interactive
@deprecated("Use scala.reflect.internal.Positions", "2.11.0")
-trait RangePositions extends scala.reflect.internal.Positions with ast.Trees with ast.Positions {
+trait RangePositions extends {
+ override val useOffsetPositions = false
@retronym

retronym Mar 24, 2013

Owner
[scalacfork] /Users/jason/code/scala/src/interactive/scala/tools/nsc/interactive/RangePositions.scala:11: warning: Implementation restriction: early definitions in traits are not initialized before the super class is initialized.
[scalacfork]   override val useOffsetPositions = false
[scalacfork]                ^
+} with scala.reflect.internal.Positions with ast.Trees with ast.Positions {
self: scala.tools.nsc.Global =>
- override def useOffsetPositions = false
}

0 comments on commit cab4762

Please sign in to comment.