make scalac invoke scala-2.10

Author: GinFungYJF

src/java/io/bazel/rulesscala/scalac/BUILD

@@ -3,9 +3,9 @@ java_binary(name = "scalac",
   srcs = ["ScalaCInvoker.java", "CompileOptions.java", "ScalacProcessor.java"],
 
   deps = [
-    "@scala//:lib/scala-library.jar",
-    "@scala//:lib/scala-reflect.jar",
-    "@scala//:lib/scala-compiler.jar",
+    "@scala210//:lib/scala-library.jar",
+    "@scala210//:lib/scala-reflect.jar",
+    "@scala210//:lib/scala-compiler.jar",
     "//src/java/io/bazel/rulesscala/jar",
     "//src/java/io/bazel/rulesscala/worker",
     "//src/java/com/google/devtools/build/lib:worker",

src/java/io/bazel/rulesscala/scalac/ScalaCInvoker.java

@@ -31,8 +31,8 @@ public ScalaCInvoker() {
   @Override protected void setupOutput(PrintStream ps) {
     System.setOut(ps);
     System.setErr(ps);
-    Console$.MODULE$.setErrDirect(ps);
-    Console$.MODULE$.setOutDirect(ps);
+    //Console$.MODULE$.setErrDirect(ps);
+    //Console$.MODULE$.setOutDirect(ps);
   }
 
 

src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java

@@ -201,10 +201,11 @@ private static void compileScalaSources(CompileOptions ops, String[] scalaSource
       constParams,
       scalaSources);
 
-    MainClass comp = new MainClass();
+    //MainClass comp = new MainClass();
     long start = System.currentTimeMillis();
     try {
-      comp.process(compilerArgs);
+      //comp.process(compilerArgs);
+      Main$.MODULE$.process(compilerArgs);
     } catch (Throwable ex) {
       if (ex.toString().contains("scala.reflect.internal.Types$TypeError")) {
         throw new RuntimeException("Build failure with type error", ex);
@@ -218,7 +219,7 @@ private static void compileScalaSources(CompileOptions ops, String[] scalaSource
     }
 
 
-    ConsoleReporter reporter = (ConsoleReporter) reporterField.get(comp);
+    ConsoleReporter reporter = (ConsoleReporter) reporterField.get(Main$.MODULE$);
 
     if (reporter.hasErrors()) {
       reporter.printSummary();

src/scala/BUILD

@@ -12,7 +12,7 @@ java_import(
 
 java_import(
   name = "scala_compiler",
-  jars = ["@scala//:lib/scala-compiler.jar"],
+  jars = ["//external:io_bazel_rules_scala/dependency/scala210/scala_compiler"],
   visibility = ["//visibility:public"],
 )