From d1a1dd9edd2892b1482d96e94e4489cd743ea3ea Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sat, 4 Oct 2025 19:08:23 +0900 Subject: [PATCH] remove unused code --- .../main/scala/sbt/internal/EvaluateConfigurations.scala | 8 -------- .../src/main/scala/sbt/internal/util/Terminal.scala | 1 - main/src/main/scala/sbt/Defaults.scala | 3 --- main/src/main/scala/sbt/internal/Compiler.scala | 1 - .../src/main/scala/sbt/util/ListInstances.scala | 1 - 5 files changed, 14 deletions(-) diff --git a/buildfile/src/main/scala/sbt/internal/EvaluateConfigurations.scala b/buildfile/src/main/scala/sbt/internal/EvaluateConfigurations.scala index 84da1235e..3458877cf 100644 --- a/buildfile/src/main/scala/sbt/internal/EvaluateConfigurations.scala +++ b/buildfile/src/main/scala/sbt/internal/EvaluateConfigurations.scala @@ -11,7 +11,6 @@ package internal import sbt.internal.util.{ AttributeKey, LineRange, MessageOnlyException, RangePosition } -import java.io.File import java.nio.file.Path import sbt.internal.util.complete.DefaultParsers.validID import Def.{ ScopedKey, Setting, Settings } @@ -51,9 +50,6 @@ private[sbt] object EvaluateConfigurations { val settings: Seq[(String, LineRange)] ) - /** The keywords we look for when classifying a string as a definition. */ - private val DefinitionKeywords = Seq("lazy val ", "def ", "val ") - /** * Using an evaluating instance of the scala compiler, a sequence of files and * the default imports to use, this method will take a ClassLoader of sbt-classes and @@ -192,10 +188,6 @@ private[sbt] object EvaluateConfigurations { } } - /** move a project to be relative to this file after we've evaluated it. */ - private def resolveBase(f: File, p: Project) = - p.copy(base = IO.resolve(f, p.base)) - private def addOffset(offset: Int, lines: Seq[(String, Int)]): Seq[(String, Int)] = lines.map { (s, i) => (s, i + offset) } diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala index 6605595b7..76016d953 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala @@ -198,7 +198,6 @@ trait Terminal extends AutoCloseable { val in = System.in val ESC = '\u001B' val EOT = '\u0004' - var result: Int = -1 def readBracket: Int = in.read() match { case '[' => readAnsiControl diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index fc64ba41a..bb6ea2a1c 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -979,7 +979,6 @@ object Defaults extends BuildCommon { }, scalacOptions := { val old = scalacOptions.value - val converter = fileConverter.value if (exportPipelining.value) Def.uncached( Vector( @@ -1955,7 +1954,6 @@ object Defaults extends BuildCommon { val hasJava = srcs.exists(_.name.endsWith(".java")) val cp = data(dependencyClasspath.value).toList val label = nameForSrc(configuration.value.name) - val fiOpts = fileInputOptions.value val reporter = (compile / bspReporter).value val converter = fileConverter.value val tFiles = tastyFiles.value @@ -3343,7 +3341,6 @@ object Classpaths { val sbtOrg = scalaOrganization.value val version = scalaVersion.value val extResolvers = externalResolvers.value - val isScala3M123 = ScalaArtifacts.isScala3M123(version) val allToolDeps = if scalaHome.value.isDefined || scalaModuleInfo.value.isEmpty || !managedScalaInstance.value then Nil diff --git a/main/src/main/scala/sbt/internal/Compiler.scala b/main/src/main/scala/sbt/internal/Compiler.scala index 52eb9a25f..50ab721e0 100644 --- a/main/src/main/scala/sbt/internal/Compiler.scala +++ b/main/src/main/scala/sbt/internal/Compiler.scala @@ -18,7 +18,6 @@ object Compiler: Def.taskDyn { val sh = Keys.scalaHome.value val app = Keys.appConfiguration.value - val sv = Keys.scalaVersion.value val managed = Keys.managedScalaInstance.value sh match case Some(h) => scalaInstanceFromHome(h) diff --git a/util-collection/src/main/scala/sbt/util/ListInstances.scala b/util-collection/src/main/scala/sbt/util/ListInstances.scala index c5917628a..3fdeafcca 100644 --- a/util-collection/src/main/scala/sbt/util/ListInstances.scala +++ b/util-collection/src/main/scala/sbt/util/ListInstances.scala @@ -10,7 +10,6 @@ package sbt.util private[sbt] object ListInstances: lazy val listMonad: Monad[List] = new Monad[List]: - type F[a] = List[a] def pure[A1](x: () => A1): List[A1] = List(x()) def ap[A, B](ff: List[A => B])(fa: List[A]): List[B] = for