From 46a5bd9558bb2b482dd7b244db631535ebd4b5f3 Mon Sep 17 00:00:00 2001 From: Jan Chyb Date: Mon, 23 Sep 2024 13:28:30 +0200 Subject: [PATCH] Run OrganiseImports --- backend/src/main/scala/bloop/Compiler.scala | 1 + .../src/main/scala/bloop/util/BestEffortUtils.scala | 7 ++++--- .../main/scala/bloop/engine/tasks/CompileTask.scala | 12 ++++++------ .../engine/tasks/compilation/CompileGraph.scala | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/backend/src/main/scala/bloop/Compiler.scala b/backend/src/main/scala/bloop/Compiler.scala index b4ead47cf..af63951e5 100644 --- a/backend/src/main/scala/bloop/Compiler.scala +++ b/backend/src/main/scala/bloop/Compiler.scala @@ -5,6 +5,7 @@ import java.io.PrintWriter import java.io.StringWriter import java.nio.file.Files import java.nio.file.Path +import java.nio.file.Paths import java.util.Optional import java.util.concurrent.Executor diff --git a/backend/src/main/scala/bloop/util/BestEffortUtils.scala b/backend/src/main/scala/bloop/util/BestEffortUtils.scala index f29cdb6df..f9dd5cbc3 100644 --- a/backend/src/main/scala/bloop/util/BestEffortUtils.scala +++ b/backend/src/main/scala/bloop/util/BestEffortUtils.scala @@ -1,11 +1,12 @@ package bloop.util -import java.security.MessageDigest - import java.math.BigInteger import java.nio.file.Files -import scala.collection.JavaConverters._ import java.nio.file.Path +import java.security.MessageDigest + +import scala.collection.JavaConverters._ + import bloop.io.AbsolutePath object BestEffortUtils { diff --git a/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala b/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala index 1f8042d85..e77375123 100644 --- a/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala +++ b/frontend/src/main/scala/bloop/engine/tasks/CompileTask.scala @@ -1,5 +1,7 @@ package bloop.engine.tasks +import java.util.Optional + import scala.collection.mutable import scala.concurrent.Promise @@ -8,8 +10,8 @@ import bloop.CompileInputs import bloop.CompileOutPaths import bloop.CompileProducts import bloop.Compiler -import bloop.Compiler.Result.Success import bloop.Compiler.Result.Failed +import bloop.Compiler.Result.Success import bloop.cli.ExitStatus import bloop.data.Project import bloop.data.WorkspaceSettings @@ -20,10 +22,10 @@ import bloop.engine.State import bloop.engine.caches.LastSuccessfulResult import bloop.engine.tasks.compilation.FinalCompileResult import bloop.engine.tasks.compilation._ +import bloop.io.AbsolutePath import bloop.io.ParallelOps import bloop.io.ParallelOps.CopyMode import bloop.io.{Paths => BloopPaths} -import bloop.io.AbsolutePath import bloop.logging.DebugFilter import bloop.logging.Logger import bloop.logging.LoggerAction @@ -39,11 +41,9 @@ import bloop.util.BestEffortUtils.BestEffortProducts import monix.execution.CancelableFuture import monix.reactive.MulticastStrategy import monix.reactive.Observable -import sbt.internal.inc.BloopComponentCompiler -import xsbti.compile.PreviousResult -import java.util.Optional -import xsbti.compile.MiniSetup import xsbti.compile.CompileAnalysis +import xsbti.compile.MiniSetup +import xsbti.compile.PreviousResult object CompileTask { private implicit val logContext: DebugFilter = DebugFilter.Compilation diff --git a/frontend/src/main/scala/bloop/engine/tasks/compilation/CompileGraph.scala b/frontend/src/main/scala/bloop/engine/tasks/compilation/CompileGraph.scala index 6268ab830..aeaf317db 100644 --- a/frontend/src/main/scala/bloop/engine/tasks/compilation/CompileGraph.scala +++ b/frontend/src/main/scala/bloop/engine/tasks/compilation/CompileGraph.scala @@ -27,9 +27,9 @@ import bloop.logging.DebugFilter import bloop.logging.LoggerAction import bloop.reporter.ReporterAction import bloop.task.Task +import bloop.util.BestEffortUtils.BestEffortProducts import bloop.util.JavaCompat.EnrichOptional import bloop.util.SystemProperties -import bloop.util.BestEffortUtils.BestEffortProducts import xsbti.compile.PreviousResult