diff options
| author | Paul Phillips <paulp@improving.org> | 2013-03-13 05:10:05 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-03-13 05:10:05 -0700 |
| commit | ac51ccdea40dc39fe1ae278e9b9b45d1e7679baf (patch) | |
| tree | d145def4b5fe44a1485d14011b9ac780c8bbf51d | |
| parent | c964643604ea9e431f4076069fbbc18953d3c1c9 (diff) | |
| parent | cab476299d90e8c9ea592c6bcdd1aa8ee3efd9c3 (diff) | |
| download | scala-ac51ccdea40dc39fe1ae278e9b9b45d1e7679baf.tar.gz scala-ac51ccdea40dc39fe1ae278e9b9b45d1e7679baf.tar.bz2 scala-ac51ccdea40dc39fe1ae278e9b9b45d1e7679baf.zip | |
Merge pull request #2246 from paulp/pr/sbt
Update sbt.latest.version to sbt's latest version.
| -rw-r--r-- | build.xml | 3 | ||||
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/RangePositions.scala | 5 |
2 files changed, 5 insertions, 3 deletions
@@ -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"/> diff --git a/src/interactive/scala/tools/nsc/interactive/RangePositions.scala b/src/interactive/scala/tools/nsc/interactive/RangePositions.scala index c57e1da184..a24be50b33 100644 --- a/src/interactive/scala/tools/nsc/interactive/RangePositions.scala +++ b/src/interactive/scala/tools/nsc/interactive/RangePositions.scala @@ -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 +} with scala.reflect.internal.Positions with ast.Trees with ast.Positions { self: scala.tools.nsc.Global => - override def useOffsetPositions = false } |