Skip to content

Commit

Permalink
Revert "Merge pull request scalacenter#2128 from Arthurm1/specify_jav…
Browse files Browse the repository at this point in the history
…ac_target_root"

This reverts commit a3a78de, reversing
changes made to 041a90b.

It seems to have caused scalacenter#2140
  • Loading branch information
tgodzik committed Aug 30, 2023
1 parent 9935f18 commit b6e316f
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -143,7 +136,7 @@ object CompileTask {
compileOut,
project.out,
newScalacOptions.toArray,
newJavacOptions.toArray,
project.javacOptions.toArray,
project.compileJdkConfig.flatMap(_.javacBin),
project.compileOrder,
project.classpathOptions,
Expand Down

0 comments on commit b6e316f

Please sign in to comment.