fixup! Catch ClassFormatErrors in ScalacInvoker

bazelbuild · Jan 22, 2025 · 3258ccb · 3258ccb
1 parent cc2f0d8
commit 3258ccb
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/src/java/io/bazel/rulesscala/scalac/ScalacWorker.java b/src/java/io/bazel/rulesscala/scalac/ScalacWorker.java
@@ -237,7 +237,7 @@ private static String[] getPluginParamsFrom(CompileOptions ops) {
       }
       if (ops.directTargets.length > 0) {
         pluginParams.add(
-          "-P:dependency-analyzer:direct-targets:" + encodeStringSeqPluginParam(ops.directTargets));
+          "-P:dependency-analyzer:direct-targets:" + encodeStringSeqPluginParam(ops.directTargets));   
       }
       if (ops.indirectJars.length > 0) {
         pluginParams.add(
@@ -269,20 +269,7 @@ private static void compileScalaSources(CompileOptions ops, String[] scalaSource
     String[] compilerArgs =
         merge(ops.scalaOpts, pluginArgs, constParams, pluginParams, scalaSources);
 
-    ScalacInvokerResults compilerResults;
-
-    try {
-      compilerResults = ScalacInvoker.invokeCompiler(ops, compilerArgs);
-    } catch (CompilationFailed exception) {
-      if (exception.getCause() instanceof ClassFormatError) {
-        throw new Exception(
-          "You may have declared a target containing a macro as a `scala_library` target instead of a `scala_macro_library` target.",
-          exception
-        );
-      }
-
-      throw exception;
-    }
+    ScalacInvokerResults compilerResults = ScalacInvoker.invokeCompiler(ops, compilerArgs);
 
     if (ops.printCompileTime) {
       System.err.println("Compiler runtime: " + (compilerResults.stopTime - compilerResults.startTime) + "ms.");