diff --git a/buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala b/buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala index 79c8bf1d2..d77ea69d2 100644 --- a/buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala +++ b/buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala @@ -11,7 +11,6 @@ package parser import sbt.internal.util.{ LineRange, MessageOnlyException } import sbt.internal.io.Retry -import java.io.File import java.nio.charset.StandardCharsets import java.util.concurrent.ConcurrentHashMap import sbt.internal.parser.SbtParser.* diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala index a75d7bb75..1a6fd47b2 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala @@ -167,7 +167,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler { case paths => val mapped = fromStrings(paths) val map = mapper(mapped.last) - IO.copy(mapped.init pair map) + IO.copy(mapped.init.pair(map)) () } diff --git a/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala b/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala index 78f256b86..3ffce7f6b 100644 --- a/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala +++ b/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala @@ -15,7 +15,7 @@ import lmcoursier.definitions.{ Type } import sbt.internal.librarymanagement.mavenint.SbtPomExtraProperties -import sbt.librarymanagement.{ Configuration as _, MavenRepository as _, * } +import sbt.librarymanagement.{ Configuration as _, * } object FromSbt { diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala b/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala index dcc8d040b..936cef804 100644 --- a/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala +++ b/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala @@ -8,7 +8,7 @@ import coursier.core.{ Authentication, Repository } import coursier.ivy.IvyRepository import coursier.maven.SbtMavenRepository import org.apache.ivy.plugins.resolver.IBiblioResolver -import sbt.librarymanagement.{ Configuration as _, MavenRepository as _, * } +import sbt.librarymanagement.* import sbt.util.Logger import scala.jdk.CollectionConverters.* diff --git a/main-actions/src/main/scala/sbt/Mapper.scala b/main-actions/src/main/scala/sbt/Mapper.scala index 8d2d6b861..ff683047e 100644 --- a/main-actions/src/main/scala/sbt/Mapper.scala +++ b/main-actions/src/main/scala/sbt/Mapper.scala @@ -49,8 +49,8 @@ object Mapper: */ def directory(baseDirectory: File)(using conv: FileConverter): Seq[(VirtualFile, String)] = Option(baseDirectory.getParentFile) - .map(parent => PathFinder(baseDirectory).allPaths pair relativeTo(parent)) - .getOrElse(PathFinder(baseDirectory).allPaths pair basic) + .map(parent => PathFinder(baseDirectory).allPaths.pair(relativeTo(parent))) + .getOrElse(PathFinder(baseDirectory).allPaths.pair(basic)) .map { (f, s) => conv.toVirtualFile(f.toPath) -> s } /** diff --git a/main-settings/src/main/scala/sbt/Reference.scala b/main-settings/src/main/scala/sbt/Reference.scala index eb5682e43..600211572 100644 --- a/main-settings/src/main/scala/sbt/Reference.scala +++ b/main-settings/src/main/scala/sbt/Reference.scala @@ -75,12 +75,12 @@ case object ThisProject extends ProjectReference case object LocalAggregate extends ProjectReference object ProjectRef { - def apply(base: File, id: String): ProjectRef = ProjectRef(IO toURI base, id) + def apply(base: File, id: String): ProjectRef = ProjectRef(IO.toURI(base), id) } object RootProject { /** Reference to the root project at 'base'. */ - def apply(base: File): RootProject = RootProject(IO toURI base) + def apply(base: File): RootProject = RootProject(IO.toURI(base)) } object Reference { given resolvedReferenceOrdering: Ordering[ResolvedReference] = { diff --git a/main/src/main/scala/sbt/EvaluateTask.scala b/main/src/main/scala/sbt/EvaluateTask.scala index 73f4ed550..a7eb82ba8 100644 --- a/main/src/main/scala/sbt/EvaluateTask.scala +++ b/main/src/main/scala/sbt/EvaluateTask.scala @@ -12,7 +12,7 @@ import java.io.File import java.util.concurrent.atomic.AtomicReference import sbt.Def.{ ScopedKey, Setting, dummyState } -import sbt.Keys.{ TaskProgress as _, name as _, * } +import sbt.Keys.{ name as _, * } import sbt.BuildExtra.* import sbt.ProjectExtra.* import sbt.Scope.Global diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala index c11088c10..e9573a12a 100644 --- a/main/src/main/scala/sbt/internal/Continuous.scala +++ b/main/src/main/scala/sbt/internal/Continuous.scala @@ -9,7 +9,7 @@ package sbt package internal -import java.io.{ ByteArrayInputStream, IOException, InputStream, File as _ } +import java.io.{ ByteArrayInputStream, IOException, InputStream } import java.nio.file.Path import java.util.concurrent.{ ConcurrentHashMap, diff --git a/main/src/main/scala/sbt/internal/DynamicInput.scala b/main/src/main/scala/sbt/internal/DynamicInput.scala index bff999c56..92d428644 100644 --- a/main/src/main/scala/sbt/internal/DynamicInput.scala +++ b/main/src/main/scala/sbt/internal/DynamicInput.scala @@ -9,8 +9,6 @@ package sbt package internal -import java.nio.file.{ WatchService as _ } - import sbt.nio.FileStamper import sbt.nio.file.Glob diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala index fe755c7aa..c6a2fd4ac 100755 --- a/main/src/main/scala/sbt/internal/Load.scala +++ b/main/src/main/scala/sbt/internal/Load.scala @@ -654,7 +654,7 @@ private[sbt] object Load { if (base.isFile) sys.error("Not a directory: " + base) else if (!base.exists) - IO createDirectory base + IO.createDirectory(base) } def checkAll( diff --git a/main/src/main/scala/sbt/internal/SettingGraph.scala b/main/src/main/scala/sbt/internal/SettingGraph.scala index 334562b18..cc27a5ca4 100644 --- a/main/src/main/scala/sbt/internal/SettingGraph.scala +++ b/main/src/main/scala/sbt/internal/SettingGraph.scala @@ -13,7 +13,6 @@ import sbt.util.Show import java.io.File import Def.{ ScopedKey, compiled, flattenLocals } -import Predef.{ any2stringadd as _, * } import sbt.ProjectExtra.scopedKeyData import sbt.io.IO