I believe I've fixed the problem with ScriptRun...

I believe I've fixed the problem with ScriptRunner and Interperter
running under jvm-1.4 compiling temporary classfiles with target
jvm-1.5.

2 files changed, 15 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
index 50973bfb71..562da8441f 100644
--- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala
+++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
@@ -278,6 +278,11 @@ class InterpreterLoop(in0: Option[BufferedReader], out: PrintWriter) {
   def main(settings: Settings) {
     this.settings = settings
 
+    val major = System.getProperty("java.class.version").split("\\.")(0)
+    if (Integer.valueOf(major).intValue < 49) {
+      this.settings.target.value = "jvm-1.4"
+    }
+
     in =
       in0 match {
         case Some(in0) =>
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index 16648e0eec..6acccc14a2 100644
--- a/src/compiler/scala/tools/nsc/ScriptRunner.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -385,6 +385,11 @@ object ScriptRunner {
       return
     }
 
+    val major = System.getProperty("java.class.version").split("\\.")(0)
+    if (Integer.valueOf(major).intValue < 49) {
+      settings.target.value = "jvm-1.4"
+    }
+
     withCompiledScript(settings, scriptFile){compiledLocation =>
       runCompiled(settings, compiledLocation, scriptArgs)
     }
@@ -405,6 +410,11 @@ object ScriptRunner {
       str.close()
     }
 
+    val major = System.getProperty("java.class.version").split("\\.")(0)
+    if (Integer.valueOf(major).intValue < 49) {
+      settings.target.value = "jvm-1.4"
+    }
+
     withCompiledScript(settings, scriptFile.getPath){compiledLocation =>
       scriptFile.delete()
       runCompiled(settings, compiledLocation, scriptArgs)