Merge pull request #2141 from tgodzik/revert-recompilation

Revert "Merge pull request #2128 from Arthurm1/specify_javac_target_root"
scalacenter · Aug 30, 2023 · 079d63c · 079d63c
2 parents aa78d67 + b6e316f
commit 079d63c
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala b/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala
@@ -125,13 +125,6 @@ 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(
@@ -143,7 +136,7 @@ object CompileTask {
               compileOut,
               project.out,
               newScalacOptions.toArray,
-              newJavacOptions.toArray,
+              project.javacOptions.toArray,
               project.compileJdkConfig.flatMap(_.javacBin),
               project.compileOrder,
               project.classpathOptions,