From b6e316f31ffa6feb878e4215dc8ce375e951809d Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Wed, 30 Aug 2023 16:28:58 +0200 Subject: [PATCH] Revert "Merge pull request #2128 from Arthurm1/specify_javac_target_root" This reverts commit a3a78de0bc7fef88b372fa312a7cd58478c1b6e9, reversing changes made to 041a90b3074cadb20f5e0ebfc2e94ccce5cd2010. It seems to have caused https://github.com/scalacenter/bloop/issues/2140 --- .../src/main/scala/bloop/engine/tasks/CompileTask.scala | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala b/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala index 3a8cca306d..69ffccce0f 100644 --- 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,