From 375e4f1d2ea3f17dd05318f876fe5e2c5b52910f Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:53:22 -0700 Subject: [PATCH] Fix bunch of unused imports --- main/src/main/scala/sbt/Main.scala | 3 --- main/src/main/scala/sbt/ScopeFilter.scala | 1 - main/src/main/scala/sbt/internal/Continuous.scala | 2 +- main/src/main/scala/sbt/internal/IncrementalTest.scala | 3 +-- main/src/main/scala/sbt/internal/LintUnused.scala | 2 +- main/src/main/scala/sbt/internal/Load.scala | 2 +- .../main/scala/sbt/internal/server/BuildServerProtocol.scala | 1 - main/src/main/scala/sbt/internal/server/NetworkChannel.scala | 1 - main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala | 1 - 9 files changed, 4 insertions(+), 12 deletions(-) diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index 488c2a7f0..f32e80764 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -16,12 +16,9 @@ import java.util.Properties import java.util.concurrent.ForkJoinPool import java.util.concurrent.atomic.AtomicBoolean -import sbt.BasicCommandStrings.{ JavaClient, Shell, Shutdown, TemplateCommand } import sbt.Project.LoadAction import sbt.ProjectExtra.* -import sbt.internal.EvalImports import sbt.internal.Aggregation.AnyKeys -import sbt.internal.CommandStrings.BootCommand import sbt.internal._ import sbt.internal.client.BspClient import sbt.internal.inc.ScalaInstance diff --git a/main/src/main/scala/sbt/ScopeFilter.scala b/main/src/main/scala/sbt/ScopeFilter.scala index c6d9a9756..08f78d390 100644 --- a/main/src/main/scala/sbt/ScopeFilter.scala +++ b/main/src/main/scala/sbt/ScopeFilter.scala @@ -13,7 +13,6 @@ import sbt.internal.util.{ AttributeKey, Dag } import sbt.librarymanagement.{ ConfigRef, Configuration } import sbt.internal.util.Types.const import Def.Initialize -import sbt.Project.inScope import java.net.URI sealed abstract class ScopeFilter { self => diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala index bfd03bc91..fb0eecbe1 100644 --- a/main/src/main/scala/sbt/internal/Continuous.scala +++ b/main/src/main/scala/sbt/internal/Continuous.scala @@ -31,7 +31,7 @@ import sbt.internal.io.WatchState import sbt.internal.nio._ import sbt.internal.ui.UITask import sbt.internal.util.JoinThread._ -import sbt.internal.util.complete.DefaultParsers.{ Space, matched } +import sbt.internal.util.complete.DefaultParsers.Space import sbt.internal.util.complete.Parser._ import sbt.internal.util.complete.{ Parser, Parsers } import sbt.internal.util._ diff --git a/main/src/main/scala/sbt/internal/IncrementalTest.scala b/main/src/main/scala/sbt/internal/IncrementalTest.scala index 180333b20..a9735acbf 100644 --- a/main/src/main/scala/sbt/internal/IncrementalTest.scala +++ b/main/src/main/scala/sbt/internal/IncrementalTest.scala @@ -11,14 +11,13 @@ package internal import java.io.File import java.util.concurrent.ConcurrentHashMap -import Keys.{ test, fileConverter, fullClasspath, streams } +import Keys.{ fileConverter, fullClasspath, streams } import sbt.Def.Initialize import sbt.internal.inc.Analysis import sbt.internal.util.Attributed import sbt.internal.util.Types.const import sbt.io.{ GlobFilter, IO, NameFilter } import sbt.protocol.testing.TestResult -import sbt.SlashSyntax0.* import sbt.util.{ ActionCache, BuildWideCacheConfiguration, CacheLevelTag, Digest } import sbt.util.CacheImplicits.given import scala.collection.concurrent diff --git a/main/src/main/scala/sbt/internal/LintUnused.scala b/main/src/main/scala/sbt/internal/LintUnused.scala index 745b719d6..6671cd70d 100644 --- a/main/src/main/scala/sbt/internal/LintUnused.scala +++ b/main/src/main/scala/sbt/internal/LintUnused.scala @@ -10,7 +10,7 @@ package sbt package internal import Keys._ -import Def.{ Setting, ScopedKey } +import Def.{ ScopedKey } import sbt.internal.util.{ FilePosition, NoPosition, SourcePosition } import java.io.File import ProjectExtra.{ extract, scopedKeyData } diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala index b9a66cdb6..c2b16d0b2 100755 --- a/main/src/main/scala/sbt/internal/Load.scala +++ b/main/src/main/scala/sbt/internal/Load.scala @@ -23,7 +23,7 @@ import sbt.internal.util.Attributed.data import sbt.internal.util.Types.const import sbt.internal.util.{ Attributed, Settings } import sbt.internal.server.BuildServerEvalReporter -import sbt.io.{ GlobFilter, IO, Path } +import sbt.io.{ GlobFilter, IO } import sbt.librarymanagement.ivy.{ InlineIvyConfiguration, IvyDependencyResolution, IvyPaths } import sbt.librarymanagement.{ Configuration, Configurations, Resolver } import sbt.nio.Settings diff --git a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala index c43d6bc0b..ed9f338a4 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala @@ -15,7 +15,6 @@ import sbt.BuildExtra.* import sbt.BuildPaths.{ configurationSources, projectStandard } import sbt.Def._ import sbt.Keys._ -import sbt.Project._ import sbt.ProjectExtra.* import sbt.ScopeFilter.Make._ import sbt.Scoped.richTaskSeq diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala index 6af553be7..d6abd1aec 100644 --- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala +++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala @@ -562,7 +562,6 @@ final class NetworkChannel( override def shutdown(): Unit = { shutdown(true) } - import sjsonnew.BasicJsonProtocol.BooleanJsonFormat override def shutdown(logShutdown: Boolean): Unit = shutdown(logShutdown, remainingCommands = None) diff --git a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala index d367cc57c..6d3bee3b3 100644 --- a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala +++ b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala @@ -13,7 +13,6 @@ import java.io.File import sbt.Def._ import sbt.Keys._ -import sbt.Project._ import sbt.ProjectExtra.* import sbt.internal.graph._ import sbt.internal.graph.backend.SbtUpdateReport