Merge pull request #2128 from Arthurm1/specify_javac_target_root

specify scip javac plugin targetroot exactly
scalacenter · Aug 1, 2023 · a3a78de · a3a78de
2 parents 041a90b + bfe873a
commit a3a78de
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala b/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala
@@ -125,6 +125,13 @@ object CompileTask {
                 5
               )
           }
+          // get Bloop to replace the javac-classes-directory instead of the scip plugin so that no internal javac APIs are used.
+          val newJavacOptions = project.javacOptions.map(option =>
+            option.replaceAllLiterally(
+              "-targetroot:javac-classes-directory",
+              s"-targetroot:${newClassesDir}"
+            )
+          )
 
           val inputs = newScalacOptions.map { newScalacOptions =>
             CompileInputs(
@@ -136,7 +143,7 @@ object CompileTask {
               compileOut,
               project.out,
               newScalacOptions.toArray,
-              project.javacOptions.toArray,
+              newJavacOptions.toArray,
               project.compileJdkConfig.flatMap(_.javacBin),
               project.compileOrder,
               project.classpathOptions,