Browse files

Remove support for Scala 2.8.x

  • Loading branch information...
1 parent f415f6a commit 90acbd9376332ea7f1bf576dc13a0cfdb38c1f9e @jorgeortiz85 jorgeortiz85 committed May 2, 2012
Showing with 6 additions and 6 deletions.
  1. +5 −5 rogue-lift/src/test/scala/com/foursquare/rogue/QueryTest.scala
  2. +1 −1 sbt
View
10 rogue-lift/src/test/scala/com/foursquare/rogue/QueryTest.scala
@@ -683,7 +683,7 @@ class QueryTest extends SpecsMatchers {
class Compiler {
import java.io.{PrintWriter, Writer}
import scala.io.Source
- import scala.tools.nsc.{Interpreter, InterpreterResults, Settings}
+ import scala.tools.nsc.{interpreter => IR, Settings}
class NullWriter extends Writer {
override def close() = ()
@@ -701,7 +701,7 @@ class QueryTest extends SpecsMatchers {
// This is deprecated in 2.9.x, but we need to use it for compatibility with 2.8.x
val stringWriter = new java.io.StringWriter()
private val interpreter =
- new Interpreter(
+ new IR.IMain(
settings,
/**
* It's a good idea to comment out this second parameter when adding or modifying
@@ -719,9 +719,9 @@ class QueryTest extends SpecsMatchers {
stringWriter.getBuffer.delete(0, stringWriter.getBuffer.length)
val thunked = "() => { %s }".format(code)
interpreter.interpret(thunked) match {
- case InterpreterResults.Success => None
- case InterpreterResults.Error => Some(stringWriter.toString)
- case InterpreterResults.Incomplete => throw new Exception("Incomplete code snippet")
+ case IR.Results.Success => None
+ case IR.Results.Error => Some(stringWriter.toString)
+ case IR.Results.Incomplete => throw new Exception("Incomplete code snippet")
}
}
}
View
2 sbt
@@ -1,7 +1,7 @@
#!/bin/bash
# Internal options, always specified
-INTERNAL_OPTS="-Dfile.encoding=UTF-8 -Xss8M -Xmx1G -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512M"
+INTERNAL_OPTS="-Dfile.encoding=UTF-8 -Xss8M -Xmx1G -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=128M"
# Default options, if nothing is specified
DEFAULT_OPTS=""

0 comments on commit 90acbd9

Please sign in to comment.