update .scalafmt.conf. enforce new scala 3 syntax

.scalafmt.conf

@@ -23,3 +23,6 @@ align.openParenDefnSite = false
 danglingParentheses.preset = true
 
 trailingCommas = preserve
+
+rewrite.scala3.convertToNewSyntax = true
+rewrite.scala3.newSyntax.control = false

build.sbt

@@ -48,13 +48,13 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
 Global / semanticdbEnabled := !(Global / insideCI).value
 // Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this.
 Global / semanticdbVersion := "4.9.9"
-val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys")
+val excludeLint = SettingKey[Set[Def.KeyedInitialize[?]]]("excludeLintKeys")
 Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty)
 Global / excludeLint += Utils.componentID
 Global / excludeLint += scriptedBufferLog
 Global / excludeLint += checkPluginCross
 
-def commonSettings: Seq[Setting[_]] = Def.settings(
+def commonSettings: Seq[Setting[?]] = Def.settings(
   headerLicense := Some(
     HeaderLicense.Custom(
       """|sbt
@@ -104,17 +104,17 @@ def commonSettings: Seq[Setting[_]] = Def.settings(
   run / fork := true,
 )
 
-def utilCommonSettings: Seq[Setting[_]] = Def.settings(
+def utilCommonSettings: Seq[Setting[?]] = Def.settings(
   baseSettings,
 )
 
-def minimalSettings: Seq[Setting[_]] =
+def minimalSettings: Seq[Setting[?]] =
   commonSettings ++ customCommands ++ Utils.publishPomSettings
 
-def baseSettings: Seq[Setting[_]] =
+def baseSettings: Seq[Setting[?]] =
   minimalSettings ++ Seq(Utils.projectComponent) ++ Utils.baseScalacOptions ++ Licensed.settings
 
-def testedBaseSettings: Seq[Setting[_]] =
+def testedBaseSettings: Seq[Setting[?]] =
   baseSettings ++ testDependencies
 
 val sbt13Plus =
@@ -152,7 +152,7 @@ val noUtilVersion =
 
 val mimaSettings = mimaSettingsSince(sbt10Plus)
 val utilMimaSettings = mimaSettingsSince(sbt10Plus.filterNot(noUtilVersion))
-def mimaSettingsSince(versions: Seq[String]): Seq[Def.Setting[_]] = Def settings (
+def mimaSettingsSince(versions: Seq[String]): Seq[Def.Setting[?]] = Def settings (
   mimaPreviousArtifacts := {
     val crossVersion = if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled
     versions.map(v => organization.value % moduleName.value % v cross crossVersion).toSet
@@ -1293,7 +1293,7 @@ lazy val docProjects: ScopeFilter = ScopeFilter(
 lazy val javafmtOnCompile = taskKey[Unit]("Formats java sources before compile")
 lazy val scriptedProjects = ScopeFilter(inAnyProject)
 
-def customCommands: Seq[Setting[_]] = Seq(
+def customCommands: Seq[Setting[?]] = Seq(
   commands += Command.command("publishLocalAllModule") { state =>
     val extracted = Project.extract(state)
     import extracted._
@@ -1344,7 +1344,7 @@ ThisBuild / publishTo := {
 }
 ThisBuild / publishMavenStyle := true
 
-def lmTestSettings: Seq[Setting[_]] = Def.settings(
+def lmTestSettings: Seq[Setting[?]] = Def.settings(
   Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat,
   Test / parallelExecution := false
 )
@@ -1422,7 +1422,7 @@ lazy val lmIvy = (project in file("lm-ivy"))
     Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
   )
 
-lazy val lmCoursierSettings: Seq[Setting[_]] = Def.settings(
+lazy val lmCoursierSettings: Seq[Setting[?]] = Def.settings(
   baseSettings,
   headerLicense := Some(
     HeaderLicense.Custom(

buildfile/src/main/scala/sbt/internal/DslEntry.scala

@@ -13,7 +13,7 @@ import sbt.internal.util.RangePosition
 
 import sbt.librarymanagement.Configuration
 
-import Def._
+import Def.*
 
 /** This represents a `Setting` expression configured by the sbt DSL. */
 sealed trait DslEntry {

buildfile/src/main/scala/sbt/internal/Eval.scala

@@ -299,7 +299,7 @@ object Eval:
   inline def apply[A](expression: String): A = ${ evalImpl[A]('{ expression }) }
   private def thisClassLoader = this.getClass.getClassLoader
   def evalImpl[A: Type](expression: Expr[String])(using qctx: Quotes): Expr[A] =
-    import quotes.reflect._
+    import quotes.reflect.*
     val sym = TypeRepr.of[A].typeSymbol
     val fullName = Expr(sym.fullName)
     '{

buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala

@@ -14,7 +14,7 @@ import sbt.internal.io.Retry
 import java.io.File
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.ConcurrentHashMap
-import sbt.internal.parser.SbtParser._
+import sbt.internal.parser.SbtParser.*
 import dotty.tools.dotc.ast.Trees.Lazy
 import dotty.tools.dotc.ast.untpd.*
 import dotty.tools.dotc.core.Contexts.*

core-macros/src/test/scala/sbt/internal/ConvertTest.scala

@@ -1,7 +1,7 @@
 package sbt.internal
 
 import verify.*
-import ConvertTestMacro._
+import ConvertTestMacro.*
 
 object ConvertTest extends BasicTestSuite:
   test("convert") {

internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala

@@ -8,8 +8,8 @@
 
 package sbt.internal.util
 
-import java.io._
-import java.util.{ List => JList }
+import java.io.*
+import java.util.{ List as JList }
 
 import jline.console.ConsoleReader
 import jline.console.history.{ FileHistory, MemoryHistory }
@@ -17,14 +17,14 @@ import org.jline.reader.{
   Candidate,
   Completer,
   EndOfFileException,
-  LineReader => JLineReader,
+  LineReader as JLineReader,
   LineReaderBuilder,
   ParsedLine,
   UserInterruptException,
 }
 import org.jline.utils.ClosedException
 import sbt.internal.util.complete.Parser
-import sbt.io.syntax._
+import sbt.io.syntax.*
 
 import scala.util.control.NonFatal
 import java.nio.channels.ClosedByInterruptException
@@ -223,7 +223,7 @@ abstract class JLine extends LineReader {
   }
 
   private def handleProgress(prompt: String): String = {
-    import ConsoleAppender._
+    import ConsoleAppender.*
     if (showProgress) s"$DeleteLine" + prompt
     else prompt
   }

internal/util-complete/src/main/scala/sbt/internal/util/complete/EditDistance.scala

@@ -9,7 +9,7 @@
 package sbt.internal.util
 package complete
 
-import java.lang.Character.{ toLowerCase => lower }
+import java.lang.Character.{ toLowerCase as lower }
 
 /** @author Paul Phillips */
 object EditDistance {

internal/util-complete/src/main/scala/sbt/internal/util/complete/HistoryCommands.scala

@@ -52,7 +52,7 @@ object HistoryCommands {
   def printHistory(history: complete.History, historySize: Int, show: Int): Unit =
     history.list(historySize, show).foreach(println)
 
-  import DefaultParsers._
+  import DefaultParsers.*
 
   val MaxLines = 500
   lazy val num = token(NatBasic, "<integer>")

internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala

@@ -9,7 +9,7 @@
 package sbt.internal.util
 package complete
 
-import Parser._
+import Parser.*
 import sbt.internal.util.Types.{ left, right, some }
 import sbt.internal.util.Util.{ makeList, separate }
 
@@ -878,7 +878,7 @@ private final class Not(delegate: Parser[?], failMessage: String) extends ValidP
 
   lazy val resultEmpty = delegate.resultEmpty match {
     case _: Failure  => Value(())
-    case _: Value[_] => mkFailure(failMessage)
+    case _: Value[?] => mkFailure(failMessage)
   }
 
   override def toString = s" -(${delegate})"

internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala

@@ -9,7 +9,7 @@
 package sbt.internal.util
 package complete
 
-import Parser._
+import Parser.*
 import java.io.File
 import java.net.URI
 import java.lang.Character.{

internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util.complete
 
-import sbt.internal.util.complete.DefaultParsers._
+import sbt.internal.util.complete.DefaultParsers.*
 
 private[sbt] object SizeParser {
   def apply(s: String): Option[Long] = Parser.parse(s, value).toOption

internal/util-complete/src/main/scala/sbt/internal/util/complete/TokenCompletions.scala

@@ -9,7 +9,7 @@
 package sbt.internal.util
 package complete
 
-import Completion.{ token => ctoken, tokenDisplay }
+import Completion.{ token as ctoken, tokenDisplay }
 
 sealed trait TokenCompletions {
   def hideWhen(f: Int => Boolean): TokenCompletions

internal/util-complete/src/main/scala/sbt/internal/util/complete/TypeString.scala

@@ -9,8 +9,8 @@
 package sbt.internal.util
 package complete
 
-import DefaultParsers._
-import TypeString._
+import DefaultParsers.*
+import TypeString.*
 
 /**
  * Basic representation of types parsed from Manifest.toString. This can only represent the

internal/util-complete/src/test/scala/DefaultParsersSpec.scala

@@ -9,7 +9,7 @@
 package sbt.internal.util
 package complete
 
-import org.scalacheck._, Gen._, Prop._
+import org.scalacheck.*, Gen.*, Prop.*
 
 object DefaultParsersSpec extends Properties("DefaultParsers") {
   import DefaultParsers.{ ID, isIDChar, matches, validID }

internal/util-complete/src/test/scala/ParserTest.scala

@@ -10,7 +10,7 @@ package sbt.internal.util
 package complete
 
 object JLineTest {
-  import DefaultParsers._
+  import DefaultParsers.*
 
   val one = "blue" | "green" | "black"
   val two = token("color" ~> Space) ~> token(one)
@@ -44,11 +44,11 @@ object JLineTest {
   }
 }
 
-import Parser._
-import org.scalacheck._
+import Parser.*
+import org.scalacheck.*
 
 object ParserTest extends Properties("Completing Parser") {
-  import Parsers._
+  import Parsers.*
   import DefaultParsers.matches
 
   val nested = (token("a1") ~ token("b2")) ~ "c3"

internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala

@@ -9,7 +9,7 @@
 package sbt.internal.util
 package complete
 
-import Completion._
+import Completion.*
 
 class ParserWithExamplesTest extends UnitSpec {
 
@@ -84,7 +84,7 @@ class ParserWithExamplesTest extends UnitSpec {
       removeInvalidExamples: Boolean
   ) {
 
-    import DefaultParsers._
+    import DefaultParsers.*
 
     val colorParser = "blue" | "green" | "black" | "red"
     val parserWithExamples: Parser[String] = new ParserWithExamples[String](

internal/util-core/src/main/scala-3/sbt/internal/util/appmacro/StringTypeTag.scala

@@ -10,7 +10,7 @@ package sbt.internal.util.appmacro
 final class StringTypeTag[A](val key: String):
   override def toString(): String = key
   override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match {
-    case x: StringTypeTag[_] => (this.key == x.key)
+    case x: StringTypeTag[?] => (this.key == x.key)
     case _                   => false
   })
   override def hashCode: Int = key.##
@@ -23,7 +23,7 @@ object StringTypeTag:
 
   import scala.quoted.*
   private def applyImpl[A: Type](using qctx: Quotes): Expr[StringTypeTag[A]] =
-    import qctx.reflect._
+    import qctx.reflect.*
     val tpe = TypeRepr.of[A]
     '{ new StringTypeTag[A](${ Expr(tpe.dealias.show) }) }
 end StringTypeTag

internal/util-logging/src/main/scala/sbt/internal/util/BasicLogger.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 
 /** Implements the level-setting methods of Logger. */
 abstract class BasicLogger extends AbstractLogger {

internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala

@@ -8,9 +8,9 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 import scala.collection.mutable.ListBuffer
-import org.apache.logging.log4j.core.{ LogEvent => XLogEvent }
+import org.apache.logging.log4j.core.{ LogEvent as XLogEvent }
 import org.apache.logging.log4j.core.appender.AbstractAppender
 import org.apache.logging.log4j.core.layout.PatternLayout
 import java.util.concurrent.atomic.AtomicInteger

internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala

@@ -14,11 +14,11 @@ import java.nio.channels.ClosedChannelException
 import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger }
 
 import org.apache.logging.log4j.core.appender.AbstractAppender
-import org.apache.logging.log4j.core.{ Appender => XAppender, LogEvent => XLogEvent }
+import org.apache.logging.log4j.core.{ Appender as XAppender, LogEvent as XLogEvent }
 import org.apache.logging.log4j.message.{ Message, ObjectMessage, ReusableObjectMessage }
-import org.apache.logging.log4j.{ Level => XLevel }
-import sbt.internal.util.ConsoleAppender._
-import sbt.util._
+import org.apache.logging.log4j.{ Level as XLevel }
+import sbt.internal.util.ConsoleAppender.*
+import sbt.util.*
 import org.apache.logging.log4j.core.AbstractLogEvent
 import org.apache.logging.log4j.message.SimpleMessageFactory
 import java.util.concurrent.atomic.AtomicReference
@@ -608,7 +608,7 @@ trait Appender extends AutoCloseable {
 
     o match {
       case x: StringEvent    => Vector(x.message) foreach { appendLog(level, _) }
-      case x: ObjectEvent[_] => appendEvent(x)
+      case x: ObjectEvent[?] => appendEvent(x)
       case _                 => Vector(o.toString) foreach { appendLog(level, _) }
     }
   }

internal/util-logging/src/main/scala/sbt/internal/util/FilterLogger.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 import scala.annotation.nowarn
 
 /**

internal/util-logging/src/main/scala/sbt/internal/util/FullLogger.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 import com.github.ghik.silencer.silent
 
 /** Promotes the simple Logger interface to the full AbstractLogger interface. */

internal/util-logging/src/main/scala/sbt/internal/util/GlobalLogging.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 import java.io.{ File, PrintWriter }
 
 /**

internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala

@@ -15,7 +15,7 @@ import java.util.{ Arrays, EnumSet }
 import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference }
 import org.jline.utils.InfoCmp.Capability
 import org.jline.utils.{ ClosedException, NonBlockingReader }
-import org.jline.terminal.{ Attributes, Size, Terminal => JTerminal }
+import org.jline.terminal.{ Attributes, Size, Terminal as JTerminal }
 import org.jline.terminal.Attributes.{ InputFlag, LocalFlag }
 import org.jline.terminal.Terminal.SignalHandler
 import org.jline.terminal.impl.{ AbstractTerminal, DumbTerminal }

internal/util-logging/src/main/scala/sbt/internal/util/LoggerWriter.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 
 /**
  * Provides a `java.io.Writer` interface to a `Logger`. Content is line-buffered and logged at

internal/util-logging/src/main/scala/sbt/internal/util/MainAppender.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 import java.io.PrintWriter
 
 object MainAppender {
@@ -22,7 +22,7 @@ object MainAppender {
       config: MainAppenderConfig,
       context: LoggerContext
   ): ManagedLogger = {
-    import config._
+    import config.*
     // TODO
     // backed setTrace backingTrace
     // multi: Logger

internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala

@@ -8,8 +8,8 @@
 
 package sbt.internal.util
 
-import sbt.internal.util.codec.JsonProtocol._
-import sbt.util._
+import sbt.internal.util.codec.JsonProtocol.*
+import sbt.util.*
 import sjsonnew.JsonFormat
 import sbt.internal.util.appmacro.StringTypeTag
 

internal/util-logging/src/main/scala/sbt/internal/util/MultiLogger.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 import scala.annotation.nowarn
 
 // note that setting the logging level on this logger has no effect on its behavior, only

internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala

@@ -16,7 +16,7 @@ import java.util.concurrent.{ Executors, LinkedBlockingQueue, TimeUnit }
 
 import jline.console.ConsoleReader
 import scala.annotation.tailrec
-import scala.concurrent.duration._
+import scala.concurrent.duration.*
 import scala.util.Try
 import scala.util.control.NonFatal
 

internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala

@@ -10,8 +10,8 @@ package sbt
 package internal
 package util.codec
 
-import sjsonnew.{ JsonWriter => JW, JsonReader => JR, JsonFormat => JF, _ }
-import sjsonnew.shaded.scalajson.ast.unsafe._
+import sjsonnew.{ JsonWriter as JW, JsonReader as JR, JsonFormat as JF, * }
+import sjsonnew.shaded.scalajson.ast.unsafe.*
 
 trait JValueFormats { self: sjsonnew.BasicJsonProtocol =>
   given JNullFormat: JF[JNull.type] = new JF[JNull.type] {

internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala

@@ -11,7 +11,7 @@ package sbt.util
 import java.io.File
 import java.util.Optional
 import java.util.function.Supplier
-import java.{ util => ju }
+import java.{ util as ju }
 
 import xsbti.{
   Action,
@@ -32,7 +32,7 @@ object InterfaceUtil {
     override def get: A = a
   }
 
-  import java.util.function.{ Function => JavaFunction }
+  import java.util.function.{ Function as JavaFunction }
   def toJavaFunction[A1, R](f: A1 => R): JavaFunction[A1, R] = new JavaFunction[A1, R] {
     override def apply(t: A1): R = f(t)
   }

internal/util-logging/src/main/scala/sbt/util/LogExchange.scala

@@ -10,8 +10,8 @@ package sbt.util
 
 import org.apache.logging.log4j.core.config.LoggerConfig
 import org.apache.logging.log4j.core.layout.PatternLayout
-import org.apache.logging.log4j.core.{ LoggerContext => XLoggerContext }
-import org.apache.logging.log4j.{ LogManager => XLogManager }
+import org.apache.logging.log4j.core.{ LoggerContext as XLoggerContext }
+import org.apache.logging.log4j.{ LogManager as XLogManager }
 import sbt.internal.util.{ Appender, ManagedLogger, TraceEvent, SuccessEvent, Util }
 import sbt.internal.util.appmacro.StringTypeTag
 

internal/util-logging/src/main/scala/sbt/util/Logger.scala

@@ -8,7 +8,7 @@
 
 package sbt.util
 
-import xsbti.{ Logger => xLogger }
+import xsbti.{ Logger as xLogger }
 import xsbti.{ Position, Problem, Severity }
 
 import sys.process.ProcessLogger

internal/util-logging/src/main/scala/sbt/util/LoggerContext.scala

@@ -8,7 +8,7 @@
 
 package sbt.util
 
-import sbt.internal.util._
+import sbt.internal.util.*
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.{ AtomicReference, AtomicBoolean }

internal/util-logging/src/test/scala/Escapes.scala

@@ -8,8 +8,8 @@
 
 package sbt.internal.util
 
-import org.scalacheck._
-import Prop._
+import org.scalacheck.*
+import Prop.*
 import Gen.{ listOf, oneOf }
 
 import EscHelpers.{ ESC, hasEscapeSequence, isEscapeTerminator, removeEscapeSequences }

internal/util-logging/src/test/scala/LogWriterTest.scala

@@ -8,11 +8,11 @@
 
 package sbt.internal.util
 
-import sbt.util._
-import org.scalacheck._
-import Arbitrary._
+import sbt.util.*
+import org.scalacheck.*
+import Arbitrary.*
 import Gen.{ listOfN, oneOf }
-import Prop._
+import Prop.*
 
 import java.io.Writer
 

internal/util-logging/src/test/scala/ManagedLoggerSpec.scala

@@ -10,7 +10,7 @@ package sbt.internal.util
 
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
-import sbt.util._
+import sbt.util.*
 import sbt.internal.util.appmacro.StringTypeTag
 import java.io.{ File, PrintWriter }
 import sbt.io.Using
@@ -28,7 +28,7 @@ class ManagedLoggerSpec extends AnyFlatSpec with Matchers {
   }
 
   it should "support event logging" in {
-    import sjsonnew.BasicJsonProtocol._
+    import sjsonnew.BasicJsonProtocol.*
     val log = newLogger("foo")
     context.addAppender("foo", asyncStdout -> Level.Info)
     log.infoEvent(1)
@@ -47,14 +47,14 @@ class ManagedLoggerSpec extends AnyFlatSpec with Matchers {
   }
 
   it should "support logging Throwable out of the box" in {
-    import sbt.internal.util.codec.JsonProtocol._
+    import sbt.internal.util.codec.JsonProtocol.*
     val log = newLogger("foo")
     context.addAppender("foo", asyncStdout -> Level.Info)
     log.infoEvent(SuccessEvent("yes"))
   }
 
   it should "allow registering Show[Int]" in {
-    import sjsonnew.BasicJsonProtocol._
+    import sjsonnew.BasicJsonProtocol.*
     val log = newLogger("foo")
     context.addAppender("foo", asyncStdout -> Level.Info)
     given ShowLines[Int] =
@@ -64,7 +64,7 @@ class ManagedLoggerSpec extends AnyFlatSpec with Matchers {
   }
 
   it should "allow registering Show[Array[Int]]" in {
-    import sjsonnew.BasicJsonProtocol._
+    import sjsonnew.BasicJsonProtocol.*
     val log = newLogger("foo")
     context.addAppender("foo", asyncStdout -> Level.Info)
     given ShowLines[Array[Int]] =
@@ -74,7 +74,7 @@ class ManagedLoggerSpec extends AnyFlatSpec with Matchers {
   }
 
   it should "allow registering Show[Vector[Vector[Int]]]" in {
-    import sjsonnew.BasicJsonProtocol._
+    import sjsonnew.BasicJsonProtocol.*
     val log = newLogger("foo")
     context.addAppender("foo", asyncStdout -> Level.Info)
     given ShowLines[Vector[Vector[Int]]] =

internal/util-logging/src/test/scala/ProblemTest.scala

@@ -9,11 +9,11 @@
 package sbt
 
 import java.net.URI
-import hedgehog._
-import hedgehog.runner._
+import hedgehog.*
+import hedgehog.runner.*
 import _root_.sbt.util.InterfaceUtil
 import InterfaceUtil.{ jl2l, jo2o, l2jl }
-import xsbti._
+import xsbti.*
 
 object ProblemTest extends Properties {
   override def tests: List[Test] = List(

internal/util-logging/src/test/scala/TestLogger.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import sbt.util._
+import sbt.util.*
 
 object TestLogger {
   def apply[T](f: Logger => T): T = {

internal/util-logic/src/test/scala/sbt/logic/Test.scala

@@ -9,12 +9,12 @@
 package sbt.internal.util
 package logic
 
-import org.scalacheck._
+import org.scalacheck.*
 import Prop.secure
 import Logic.{ LogicException, Matched }
 
 object LogicTest extends Properties("Logic") {
-  import TestClauses._
+  import TestClauses.*
 
   property("Handles trivial resolution.") = secure(expect(trivial, Set(A)))
   property("Handles less trivial resolution.") = secure(expect(lessTrivial, Set(B, A, D)))

internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala

@@ -8,7 +8,7 @@
 
 package sbt.internal.util
 
-import Relation._
+import Relation.*
 
 object Relation {
 

internal/util-relation/src/test/scala/RelationTest.scala

@@ -8,8 +8,8 @@
 
 package sbt.internal.util
 
-import org.scalacheck._
-import Prop._
+import org.scalacheck.*
+import Prop.*
 
 object RelationTest extends Properties("Relation") {
   property("Added entry check") = forAll { (pairs: List[(Int, Double)]) =>

internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala

@@ -14,7 +14,7 @@ import java.io.File
 import sbt.nio.file.{ FileTreeView, Glob, PathFilter, RecursiveGlob }
 import sbt.io.{ IO, Path }
 import sbt.io.syntax.*
-import Path._
+import Path.*
 
 class FileCommands(baseDirectory: File) extends BasicStatementHandler {
   final val OR = "||"

internal/util-scripted/src/main/scala/sbt/internal/scripted/FilteredLoader.scala

@@ -10,7 +10,7 @@ package sbt
 package internal
 package scripted
 
-import java.{ util => ju }
+import java.{ util as ju }
 import java.net.URL
 
 final class FilteredLoader(parent: ClassLoader) extends ClassLoader(parent) {

internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala

@@ -15,7 +15,7 @@ import sbt.util.{ Logger, LoggerContext, Level }
 import sbt.internal.util.{ Appender, ManagedLogger, ConsoleAppender, BufferedAppender }
 import sbt.io.IO.wrapNull
 import sbt.io.{ DirectoryFilter, HiddenFileFilter }
-import sbt.io.syntax._
+import sbt.io.syntax.*
 import sbt.internal.io.Resources
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -201,7 +201,7 @@ object ListTests {
   def list(directory: File, filter: java.io.FileFilter): Seq[File] =
     wrapNull(directory.listFiles(filter)).toSeq
 }
-import ListTests._
+import ListTests.*
 final class ListTests(baseDirectory: File, accept: ScriptedTest => Boolean, log: Logger) {
   def filter = DirectoryFilter -- HiddenFileFilter
   def listTests: Seq[ScriptedTest] = {

internal/util-scripted/src/main/scala/sbt/internal/scripted/TestScriptParser.scala

@@ -11,7 +11,7 @@ package internal
 package scripted
 
 import java.io.File
-import scala.util.parsing.combinator._
+import scala.util.parsing.combinator.*
 import scala.util.parsing.input.Positional
 import Character.isWhitespace
 import sbt.io.IO
@@ -40,7 +40,7 @@ private object TestScriptParser {
   val WordRegex = """[^ \[\]\s'\"][^ \[\]\s]*""".r
 }
 
-import TestScriptParser._
+import TestScriptParser.*
 class TestScriptParser(handlers: Map[Char, StatementHandler]) extends RegexParsers {
   require(handlers.nonEmpty)
   override def skipWhitespace = false

lm-core/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala

@@ -1,9 +1,9 @@
 package sbt.internal.librarymanagement
 
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 import sbt.util.{ Level, Logger }
 
-import Configurations._
+import Configurations.*
 
 final class CompatibilityWarningOptions private[sbt] (
     val configurations: Seq[Configuration],

lm-core/src/main/scala/sbt/internal/librarymanagement/InternalDefaults.scala

@@ -2,8 +2,8 @@ package sbt
 package internal.librarymanagement
 
 import java.io.File
-import sbt.librarymanagement._
-import sbt.io.syntax._
+import sbt.librarymanagement.*
+import sbt.io.syntax.*
 
 /**
  * This is a list of functions with default values.

lm-core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala

@@ -2,7 +2,7 @@ package sbt.internal.librarymanagement
 
 import java.io.File
 import sbt.util.{ CacheStore, Logger }
-import sbt.librarymanagement._, LibraryManagementCodec._
+import sbt.librarymanagement.*, LibraryManagementCodec.*
 import sbt.io.IO
 
 private[sbt] object JsonUtil {

lm-core/src/main/scala/sbt/internal/librarymanagement/UpdateClassifiersUtil.scala

@@ -1,7 +1,7 @@
 package sbt.internal.librarymanagement
 
 import java.io.File
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 
 object UpdateClassifiersUtil {
 

lm-core/src/main/scala/sbt/internal/librarymanagement/formats/GlobalLockFormat.scala

@@ -1,7 +1,7 @@
 package sbt.internal.librarymanagement.formats
 
-import sjsonnew._
-import xsbti._
+import sjsonnew.*
+import xsbti.*
 import java.io.File
 import java.util.concurrent.Callable
 
@@ -10,7 +10,7 @@ import java.util.concurrent.Callable
  * This is mostly for making IvyConfiguration serializable to JSON.
  */
 trait GlobalLockFormat { self: BasicJsonProtocol =>
-  import GlobalLockFormats._
+  import GlobalLockFormats.*
 
   given globalLockIsoString: IsoString[GlobalLock] =
     IsoString.iso(_ => "<lock>", _ => NoGlobalLock)

lm-core/src/main/scala/sbt/internal/librarymanagement/formats/LoggerFormat.scala

@@ -1,7 +1,7 @@
 package sbt.internal.librarymanagement.formats
 
-import sjsonnew._
-import xsbti._
+import sjsonnew.*
+import xsbti.*
 import sbt.util.Logger.Null
 
 /**

lm-core/src/main/scala/sbt/internal/librarymanagement/formats/LogicalClockFormats.scala

@@ -1,6 +1,6 @@
 package sbt.internal.librarymanagement.formats
 
-import sjsonnew._
+import sjsonnew.*
 
 import sbt.librarymanagement.LogicalClock
 

lm-core/src/main/scala/sbt/internal/librarymanagement/formats/NodeSeqFormat.scala

@@ -1,7 +1,7 @@
 package sbt.internal.librarymanagement.formats
 
-import sjsonnew._
-import scala.xml._
+import sjsonnew.*
+import scala.xml.*
 
 trait NodeSeqFormat { self: BasicJsonProtocol =>
   given NodeSeqFormat: JsonFormat[NodeSeq] = projectFormat[NodeSeq, String](

lm-core/src/main/scala/sbt/librarymanagement/ArtifactExtra.scala

@@ -101,7 +101,7 @@ private[librarymanagement] abstract class ArtifactFunctions {
     )
   }
   def artifactName(scalaVersion: ScalaVersion, module: ModuleID, artifact: Artifact): String = {
-    import artifact._
+    import artifact.*
     val classifierStr = classifier match { case None => ""; case Some(c) => "-" + c }
     val cross = CrossVersion(module.crossVersion, scalaVersion.full, scalaVersion.binary)
     val base = CrossVersion.applyCross(artifact.name, cross)

lm-core/src/main/scala/sbt/librarymanagement/CrossVersionExtra.scala

@@ -1,7 +1,7 @@
 package sbt.librarymanagement
 
 import sbt.internal.librarymanagement.cross.CrossVersionUtil
-import sbt.librarymanagement.syntax._
+import sbt.librarymanagement.syntax.*
 
 final case class ScalaVersion(full: String, binary: String)
 

lm-core/src/main/scala/sbt/librarymanagement/DependencyBuilders.scala

@@ -14,7 +14,7 @@ trait DependencyBuilders {
   // Avoid calling super
   // Avoid initializer statements in the body
 
-  import DependencyBuilders._
+  import DependencyBuilders.*
 
   implicit def stringToOrganization(organization: String): Organization = {
     nonEmpty(organization, "Organization")

lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala

@@ -3,14 +3,14 @@ package sbt.librarymanagement
 import java.io.File
 import sbt.util.Logger
 import sbt.io.Hash
-import sbt.librarymanagement.syntax._
+import sbt.librarymanagement.syntax.*
 
 /**
  * Library management API to resolve dependencies.
  */
 class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface) {
-  import sbt.internal.librarymanagement.InternalDefaults._
-  import sbt.internal.librarymanagement.UpdateClassifiersUtil._
+  import sbt.internal.librarymanagement.InternalDefaults.*
+  import sbt.internal.librarymanagement.UpdateClassifiersUtil.*
 
   /**
    * Builds a ModuleDescriptor that describes a subproject with dependencies.
@@ -160,7 +160,7 @@ class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface
       artifacts: Vector[(String, ModuleID, Artifact, File)],
       log: Logger
   ): Either[UnresolvedWarning, UpdateReport] = {
-    import config.module._
+    import config.module.*
     val artifactFilter = getArtifactTypeFilter(config.updateConfiguration.artifactFilter)
     assert(classifiers.nonEmpty, "classifiers cannot be empty")
     assert(artifactFilter.types.nonEmpty, "UpdateConfiguration must filter on some types")
@@ -198,7 +198,7 @@ class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface
 
   protected def directDependenciesNames(module: ModuleDescriptor): String =
     (module.directDependencies map { case mID: ModuleID =>
-      import mID._
+      import mID.*
       s"$organization % $name % $revision"
     }).mkString(", ")
 }

lm-core/src/main/scala/sbt/librarymanagement/EvictionWarning.scala

@@ -398,7 +398,7 @@ object EvictionWarning {
   }
 
   given evictionWarningLines: ShowLines[EvictionWarning] = ShowLines { (a: EvictionWarning) =>
-    import ShowLines._
+    import ShowLines.*
     val out: mutable.ListBuffer[String] = mutable.ListBuffer()
     if (a.options.warnEvictionSummary && a.binaryIncompatibleEvictionExists) {
       out += "There may be incompatibilities among your library dependencies; run 'evicted' to see detailed eviction warnings."
@@ -423,7 +423,7 @@ object EvictionWarning {
 
   private[sbt] def infoAllTheThings(a: EvictionWarning): List[String] =
     if (a.options.infoAllEvictions) {
-      import ShowLines._
+      import ShowLines.*
       val evo = a.options
       val out: mutable.ListBuffer[String] = mutable.ListBuffer()
       a.allEvictions foreach { ev =>

lm-core/src/main/scala/sbt/librarymanagement/Http.scala

@@ -1,6 +1,6 @@
 package sbt.librarymanagement
 
-import gigahorse._, support.apachehttp.Gigahorse
+import gigahorse.*, support.apachehttp.Gigahorse
 import scala.concurrent.duration.DurationInt
 
 object Http {

lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala

@@ -26,7 +26,7 @@ trait LibraryManagementSyntax
   type InclusionRule = InclExclRule
   final val InclusionRule = InclExclRule
 
-  import sbt.librarymanagement.{ Configurations => C }
+  import sbt.librarymanagement.{ Configurations as C }
   final val Compile = C.Compile
   final val Test = C.Test
   final val Runtime = C.Runtime

lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala

@@ -7,7 +7,7 @@ import java.net.URI
 
 import sbt.internal.librarymanagement.mavenint.SbtPomExtraProperties
 import scala.collection.mutable.ListBuffer
-import sbt.librarymanagement.syntax._
+import sbt.librarymanagement.syntax.*
 import sbt.util.Logger
 
 private[librarymanagement] abstract class ModuleIDExtra {

lm-core/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala

@@ -26,7 +26,7 @@ final class RichUpdateReport(report: UpdateReport) {
     UpdateReport(report.cachedDescriptor, report.configurations, report.stats, stamps)
   }
 
-  import DependencyFilter._
+  import DependencyFilter.*
 
   /** Obtains all successfully retrieved files in all configurations and modules. */
   def allFiles: Vector[File] = matching(DependencyFilter.allPass)
@@ -113,7 +113,7 @@ final class RichUpdateReport(report: UpdateReport) {
 
   private[sbt] def moduleReportMap(f: (ConfigRef, ModuleReport) => ModuleReport): UpdateReport = {
     val newConfigurations = report.configurations.map { confReport =>
-      import confReport._
+      import confReport.*
       val newModules = modules map { modReport =>
         f(configuration, modReport)
       }

lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala

@@ -4,7 +4,7 @@
 package sbt.librarymanagement
 
 import java.io.File
-import java.{ util => ju }
+import java.{ util as ju }
 
 private[librarymanagement] abstract class ConfigurationReportExtra {
   def configuration: ConfigRef
@@ -111,7 +111,7 @@ private[librarymanagement] abstract class ModuleReportExtra {
     } getOrElse ""
 
   private def calendarToString(c: ju.Calendar): String = {
-    import sjsonnew._, BasicJsonProtocol._
+    import sjsonnew.*, BasicJsonProtocol.*
     implicitly[IsoString[ju.Calendar]] to c
   }
 

lm-core/src/main/scala/sbt/librarymanagement/VersionNumber.scala

@@ -179,7 +179,7 @@ object VersionNumber {
    * Also API compatibility is expected even when the first segment is zero.
    */
   object PackVer extends VersionNumberCompatibility {
-    import SemVer._
+    import SemVer.*
 
     def name: String = "Package Versioning Policy"
 
@@ -199,7 +199,7 @@ object VersionNumber {
    * A variant of SemVar that enforces API compatibility when the first segment is zero.
    */
   object EarlySemVer extends VersionNumberCompatibility {
-    import SemVer._
+    import SemVer.*
 
     def name: String = "Early Semantic Versioning"
 

lm-core/src/test/scala/ConfigMacroSpec.scala

@@ -3,8 +3,8 @@ package sbt.internal.librarymanagement
 import sbt.librarymanagement.Configuration
 import sbt.librarymanagement.Configurations.config
 import scala.util.control.NonFatal
-import org.scalacheck._
-import Prop._
+import org.scalacheck.*
+import Prop.*
 
 class ConfigDefs {
   lazy val Kompile = config("kompile")
@@ -16,7 +16,7 @@ class ConfigDefs {
 
 object ConfigMacroSpec extends Properties("ConfigMacroSpec") {
   lazy val cd = new ConfigDefs
-  import cd._
+  import cd.*
 
   def secure(f: => Prop): Prop =
     try {

lm-core/src/test/scala/sbt/librarymanagement/CrossVersionTest.scala

@@ -1,7 +1,7 @@
 package sbt.librarymanagement
 
 import sbt.internal.librarymanagement.UnitSpec
-import CrossVersion._
+import CrossVersion.*
 import scala.annotation.nowarn
 
 class CrossVersionTest extends UnitSpec {

lm-core/src/test/scala/sbt/librarymanagement/ModuleIdTest.scala

@@ -22,13 +22,13 @@ object ModuleIdTest extends verify.BasicTestSuite {
   }
 
   test("it should format itself into JSON") {
-    import LibraryManagementCodec._
+    import LibraryManagementCodec.*
     val json = Converter.toJson(ModuleID("com.acme", "foo", "1")).get
     assert(CompactPrinter(json) == expectedJson)
   }
 
   test("it should thaw back from JSON") {
-    import LibraryManagementCodec._
+    import LibraryManagementCodec.*
     val json = Parser.parseUnsafe(expectedJson)
     val m = Converter.fromJsonUnsafe[ModuleID](json)
     assert(m == ModuleID("com.acme", "foo", "1"))

lm-coursier/definitions/src/main/scala/lmcoursier/credentials/DirectCredentials.scala

@@ -1,6 +1,6 @@
 package lmcoursier.credentials
 
-import dataclass._
+import dataclass.*
 
 @data class DirectCredentials(
     host: String = "",

lm-coursier/definitions/src/main/scala/lmcoursier/definitions/Authentication.scala

@@ -1,6 +1,6 @@
 package lmcoursier.definitions
 
-import dataclass._
+import dataclass.*
 
 @data class Authentication(
     user: String,

lm-coursier/definitions/src/main/scala/lmcoursier/definitions/Strict.scala

@@ -1,6 +1,6 @@
 package lmcoursier.definitions
 
-import dataclass._
+import dataclass.*
 
 @data class Strict(
     include: Set[(String, String)] = Set(("*", "*")),

lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala

@@ -21,9 +21,9 @@ import lmcoursier.internal.{
   UpdateParams,
   UpdateRun
 }
-import lmcoursier.syntax._
+import lmcoursier.syntax.*
 import sbt.internal.librarymanagement.IvySbt
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 import sbt.util.Logger
 import coursier.core.Dependency
 import coursier.core.Publication
@@ -92,7 +92,7 @@ class CoursierDependencyResolution(
         report0
 
       case Left(unresolvedWarning) =>
-        import sbt.util.ShowLines._
+        import sbt.util.ShowLines.*
         unresolvedWarning.lines.foreach(log.warn(_))
         throw unresolvedWarning.resolveException
     }

lm-coursier/src/main/scala/lmcoursier/FromSbt.scala

@@ -1,6 +1,6 @@
 package lmcoursier
 
-import coursier.ivy.IvyXml.{ mappings => ivyXmlMappings }
+import coursier.ivy.IvyXml.{ mappings as ivyXmlMappings }
 import lmcoursier.definitions.{
   Classifier,
   Configuration,
@@ -15,7 +15,7 @@ import lmcoursier.definitions.{
   Type
 }
 import sbt.internal.librarymanagement.mavenint.SbtPomExtraProperties
-import sbt.librarymanagement.{ Configuration => _, MavenRepository => _, _ }
+import sbt.librarymanagement.{ Configuration as _, MavenRepository as _, * }
 
 object FromSbt {
 

lm-coursier/src/main/scala/lmcoursier/Inputs.scala

@@ -1,6 +1,6 @@
 package lmcoursier
 
-import coursier.ivy.IvyXml.{ mappings => initialIvyXmlMappings }
+import coursier.ivy.IvyXml.{ mappings as initialIvyXmlMappings }
 import lmcoursier.definitions.{ Configuration, Module, ModuleName, Organization }
 import sbt.librarymanagement.{ CrossVersion, InclExclRule, ModuleID }
 import sbt.util.Logger

lm-coursier/src/main/scala/lmcoursier/internal/CoursierModuleDescriptor.scala

@@ -1,7 +1,7 @@
 package lmcoursier.internal
 
 import lmcoursier.CoursierConfiguration
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 
 private[lmcoursier] final case class CoursierModuleDescriptor(
     descriptor: ModuleDescriptorConfiguration,

lm-coursier/src/main/scala/lmcoursier/internal/InterProjectRepository.scala

@@ -1,6 +1,6 @@
 package lmcoursier.internal
 
-import coursier.core._
+import coursier.core.*
 import coursier.util.{ EitherT, Monad }
 
 // private[coursier]

lm-coursier/src/main/scala/lmcoursier/internal/ResolutionParams.scala

@@ -4,7 +4,7 @@ import java.io.File
 
 import coursier.cache.{ CacheLogger, FileCache }
 import coursier.ProjectCache
-import coursier.core._
+import coursier.core.*
 import coursier.params.rule.Strict
 import lmcoursier.FallbackDependency
 import lmcoursier.definitions.ToCoursier

lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala

@@ -3,7 +3,7 @@ package lmcoursier.internal
 import coursier.{ Resolution, Resolve }
 import coursier.cache.internal.ThreadUtil
 import coursier.cache.loggers.{ FallbackRefreshDisplay, ProgressBarRefreshDisplay, RefreshLogger }
-import coursier.core._
+import coursier.core.*
 import coursier.error.ResolutionError
 import coursier.error.ResolutionError.CantDownloadModule
 import coursier.ivy.IvyRepository

lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala

@@ -8,10 +8,10 @@ import coursier.core.{ Authentication, Repository }
 import coursier.ivy.IvyRepository
 import coursier.maven.SbtMavenRepository
 import org.apache.ivy.plugins.resolver.IBiblioResolver
-import sbt.librarymanagement.{ Configuration => _, MavenRepository => _, _ }
+import sbt.librarymanagement.{ Configuration as _, MavenRepository as _, * }
 import sbt.util.Logger
 
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 
 object Resolvers {
 

lm-coursier/src/main/scala/lmcoursier/internal/SbtCoursierCache.scala

@@ -2,7 +2,7 @@ package lmcoursier.internal
 
 import java.util.concurrent.ConcurrentHashMap
 
-import coursier.core._
+import coursier.core.*
 import sbt.librarymanagement.UpdateReport
 import coursier.cache.FileCache
 import coursier.util.Task
@@ -10,7 +10,7 @@ import coursier.util.Task
 // private[coursier]
 class SbtCoursierCache {
 
-  import SbtCoursierCache._
+  import SbtCoursierCache.*
 
   private val resolutionsCache =
     new ConcurrentHashMap[ResolutionKey, Map[Configuration, Resolution]]

lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala

@@ -8,7 +8,7 @@ import coursier.{ Attributes, Dependency, Module, Project, Resolution }
 import coursier.core.{ Classifier, Configuration, Extension, Info, Publication, Type }
 import coursier.maven.MavenAttributes
 import coursier.util.Artifact
-import sbt.librarymanagement.{ Artifact => _, Configuration => _, _ }
+import sbt.librarymanagement.{ Artifact as _, Configuration as _, * }
 import sbt.util.Logger
 
 import scala.annotation.tailrec

lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala

@@ -4,7 +4,7 @@ import java.io.{ File, FileNotFoundException, IOException }
 import java.net.{ HttpURLConnection, URL, URLConnection }
 
 import coursier.cache.{ ConnectionBuilder, FileCache }
-import coursier.core._
+import coursier.core.*
 import coursier.util.{ Artifact, EitherT, Monad }
 
 import scala.util.Try

lm-coursier/src/main/scala/lmcoursier/internal/UpdateParams.scala

@@ -2,7 +2,7 @@ package lmcoursier.internal
 
 import java.io.File
 
-import coursier.core._
+import coursier.core.*
 import coursier.util.Artifact
 
 // private[coursier]

lm-coursier/src/main/scala/lmcoursier/internal/UpdateRun.scala

@@ -2,7 +2,7 @@ package lmcoursier.internal
 
 import coursier.cache.loggers.RefreshLogger
 import coursier.core.Resolution.ModuleVersion
-import coursier.core._
+import coursier.core.*
 import coursier.util.Print
 import sbt.librarymanagement.UpdateReport
 import sbt.util.Logger

lm-coursier/src/main/scala/lmcoursier/syntax/package.scala

@@ -1,8 +1,8 @@
 package lmcoursier
 
 import coursier.cache.CacheDefaults
-import lmcoursier.credentials._
-import lmcoursier.definitions._
+import lmcoursier.credentials.*
+import lmcoursier.definitions.*
 import sbt.librarymanagement.{ Resolver, UpdateConfiguration }
 import xsbti.Logger
 

lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala

@@ -4,7 +4,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.propspec.AnyPropSpec
 import sbt.internal.librarymanagement.cross.CrossVersionUtil
 import sbt.internal.util.ConsoleLogger
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 import sbt.librarymanagement.Configurations.Component
 import sbt.librarymanagement.Resolver.{
   DefaultMavenRepository,
@@ -12,7 +12,7 @@ import sbt.librarymanagement.Resolver.{
   JavaNet2Repository
 }
 import sbt.librarymanagement.{ Resolver, UnresolvedWarningConfiguration, UpdateConfiguration }
-import sbt.librarymanagement.syntax._
+import sbt.librarymanagement.syntax.*
 
 final class ResolutionSpec extends AnyPropSpec with Matchers {
 

lm-ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala

@@ -6,7 +6,7 @@ package sbt.internal.librarymanagement
 import java.io.File
 import java.util.concurrent.Callable
 import sbt.util.Logger
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 
 /**
  * A component manager provides access to the pieces of xsbt that are distributed as components.

lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala

@@ -24,22 +24,22 @@ import org.apache.ivy.plugins.resolver.{
   SshResolver,
   URLResolver
 }
-import org.apache.ivy.plugins.repository.url.{ URLRepository => URLRepo }
-import org.apache.ivy.plugins.repository.file.{ FileResource, FileRepository => FileRepo }
+import org.apache.ivy.plugins.repository.url.{ URLRepository as URLRepo }
+import org.apache.ivy.plugins.repository.file.{ FileResource, FileRepository as FileRepo }
 import java.io.{ File, IOException }
 import java.util.Date
 
-import org.apache.ivy.core.module.descriptor.{ Artifact => IArtifact }
+import org.apache.ivy.core.module.descriptor.{ Artifact as IArtifact }
 import org.apache.ivy.core.module.id.ModuleRevisionId
 import org.apache.ivy.core.module.descriptor.DefaultArtifact
 import org.apache.ivy.core.report.DownloadReport
 import org.apache.ivy.plugins.resolver.util.{ ResolvedResource, ResourceMDParser }
 import org.apache.ivy.util.{ ChecksumHelper, FileUtil, Message }
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 import sbt.internal.librarymanagement.mavenint.PomExtraDependencyAttributes
 import sbt.io.IO
 import sbt.util.Logger
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 import sbt.librarymanagement.ivy.UpdateOptions
 
 private[sbt] object ConvertResolver {
@@ -98,7 +98,7 @@ private[sbt] object ConvertResolver {
    * TODO - See about contributing back to ivy.
    */
   private trait ChecksumFriendlyURLResolver extends RepositoryResolver {
-    import ChecksumFriendlyURLResolver._
+    import ChecksumFriendlyURLResolver.*
     private def signerName: String = signerNameField match {
       case Some(field) => field.get(this).asInstanceOf[String]
       case None        => null
@@ -273,7 +273,7 @@ private[sbt] object ConvertResolver {
      */
     def managedChecksumsEnabled: Boolean
 
-    import sbt.io.syntax._
+    import sbt.io.syntax.*
     private def downloadChecksum(
         resource: Resource,
         targetChecksumFile: File,
@@ -347,8 +347,8 @@ private[sbt] object ConvertResolver {
       resolver: AbstractSshBasedResolver,
       connection: SshConnection
   ): Unit = {
-    import resolver._
-    import connection._
+    import resolver.*
+    import connection.*
     hostname.foreach(setHost)
     port.foreach(setPort)
     authentication foreach {

lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala

@@ -171,7 +171,7 @@ object CustomPomParser {
   // The extra sbt plugin metadata in pom.xml does not need to be readable by maven, but the other information may be.
   // However, the pom.xml needs to be valid in all cases because other tools like repository managers may read the pom.xml.
   private[sbt] def getPomProperties(md: ModuleDescriptor): Map[String, String] = {
-    import scala.jdk.CollectionConverters._
+    import scala.jdk.CollectionConverters.*
     PomModuleDescriptorBuilder
       .extractPomProperties(md.getExtraInfo)
       .asInstanceOf[java.util.Map[String, String]]
@@ -188,7 +188,7 @@ object CustomPomParser {
       properties: Map[String, String],
       id: ModuleRevisionId
   ): ModuleRevisionId = {
-    import scala.jdk.CollectionConverters._
+    import scala.jdk.CollectionConverters.*
     val oldExtra = qualifiedExtra(id)
     val newExtra = (oldExtra ++ properties).asJava
     // remove the sbt plugin cross version from the resolved ModuleRevisionId
@@ -275,7 +275,7 @@ object CustomPomParser {
       case None => dd
     }
 
-  import scala.jdk.CollectionConverters._
+  import scala.jdk.CollectionConverters.*
   def addExtra(
       properties: Map[String, String],
       dependencyExtra: Map[ModuleRevisionId, Map[String, String]],

lm-ivy/src/main/scala/sbt/internal/librarymanagement/FakeResolver.scala

@@ -6,7 +6,7 @@ import java.net.URI
 import org.apache.ivy.core.cache.ArtifactOrigin
 import org.apache.ivy.core.cache.{ DefaultRepositoryCacheManager, RepositoryCacheManager }
 import org.apache.ivy.core.module.descriptor.{
-  Artifact => IvyArtifact,
+  Artifact as IvyArtifact,
   DefaultArtifact,
   DefaultDependencyArtifactDescriptor,
   DefaultModuleDescriptor,
@@ -24,7 +24,7 @@ import org.apache.ivy.plugins.namespace.Namespace
 import org.apache.ivy.plugins.resolver.{ DependencyResolver, ResolverSettings }
 import org.apache.ivy.plugins.resolver.util.ResolvedResource
 
-import FakeResolver._
+import FakeResolver.*
 
 /**
  * A fake `DependencyResolver` that statically serves predefined artifacts.

lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala

@@ -15,7 +15,7 @@ import org.apache.ivy.core.module.descriptor.{
   DefaultArtifact,
   DefaultDependencyArtifactDescriptor,
   MDArtifact,
-  Artifact => IArtifact
+  Artifact as IArtifact
 }
 import org.apache.ivy.core.module.descriptor.{
   DefaultDependencyDescriptor,
@@ -26,25 +26,25 @@ import org.apache.ivy.core.module.descriptor.{
 }
 import org.apache.ivy.core.module.descriptor.OverrideDependencyDescriptorMediator
 import org.apache.ivy.core.module.id.{ ModuleId, ModuleRevisionId }
-import org.apache.ivy.core.resolve._
+import org.apache.ivy.core.resolve.*
 import org.apache.ivy.core.settings.IvySettings
 import org.apache.ivy.core.sort.SortEngine
 import org.apache.ivy.plugins.matcher.PatternMatcher
 import org.apache.ivy.plugins.resolver.DependencyResolver
 import org.apache.ivy.util.{ Message, MessageLogger }
 import org.apache.ivy.util.extendable.ExtendableItem
-import org.apache.ivy.util.url._
+import org.apache.ivy.util.url.*
 import scala.xml.NodeSeq
 import scala.collection.mutable
 import scala.collection.immutable.ArraySeq
 import scala.util.{ Success, Failure }
-import sbt.util._
-import sbt.librarymanagement.{ ModuleDescriptorConfiguration => InlineConfiguration, _ }
+import sbt.util.*
+import sbt.librarymanagement.{ ModuleDescriptorConfiguration as InlineConfiguration, * }
 import sbt.librarymanagement.Platform
-import sbt.librarymanagement.ivy._
-import sbt.librarymanagement.syntax._
+import sbt.librarymanagement.ivy.*
+import sbt.librarymanagement.syntax.*
 
-import IvyInternalDefaults._
+import IvyInternalDefaults.*
 import Resolver.PluginPattern
 import ivyint.{
   CachedResolutionResolveCache,
@@ -295,7 +295,7 @@ final class IvySbt(
       (baseModule, baseConfiguration)
     }
     private def configureInline(ic: InlineConfiguration, log: Logger) = {
-      import ic._
+      import ic.*
       val moduleID = newConfiguredModuleID(module, moduleInfo, ic.configurations)
       IvySbt.setConflictManager(moduleID, conflictManager, ivy.getSettings)
       val defaultConf = defaultConfiguration getOrElse Configuration.of(
@@ -560,7 +560,7 @@ private[sbt] object IvySbt {
    * Clearly, it would be better to have an explicit option in Ivy to control this.
    */
   def hasImplicitClassifier(artifact: IArtifact): Boolean = {
-    import scala.jdk.CollectionConverters._
+    import scala.jdk.CollectionConverters.*
     artifact.getQualifiedExtraAttributes.asScala.keys
       .exists(_.asInstanceOf[String].startsWith("m:"))
   }
@@ -571,9 +571,9 @@ private[sbt] object IvySbt {
   ): Unit = {
     val existing = settings.getResolverNames
     for (moduleConf <- moduleConfigurations) {
-      import moduleConf._
-      import IvyPatternHelper._
-      import PatternMatcher._
+      import moduleConf.*
+      import IvyPatternHelper.*
+      import PatternMatcher.*
       if (!existing.contains(resolver.name))
         settings.addResolver(ConvertResolver(resolver, settings, UpdateOptions(), log))
       val attributes = javaMap(
@@ -670,9 +670,9 @@ private[sbt] object IvySbt {
     settings.setDefaultRepositoryCacheManager(manager)
   }
   def toIvyConfiguration(configuration: Configuration) = {
-    import org.apache.ivy.core.module.descriptor.{ Configuration => IvyConfig }
-    import IvyConfig.Visibility._
-    import configuration._
+    import org.apache.ivy.core.module.descriptor.{ Configuration as IvyConfig }
+    import IvyConfig.Visibility.*
+    import configuration.*
     new IvyConfig(
       name,
       if (isPublic) PUBLIC else PRIVATE,
@@ -707,7 +707,7 @@ private[sbt] object IvySbt {
 
   /** Converts the given sbt module id into an Ivy ModuleRevisionId. */
   def toID(m: ModuleID) = {
-    import m._
+    import m.*
     ModuleRevisionId.newInstance(
       organization,
       name,
@@ -794,7 +794,7 @@ private[sbt] object IvySbt {
     artifact
   }
   def getExtraAttributes(revID: ExtendableItem): Map[String, String] = {
-    import scala.jdk.CollectionConverters._
+    import scala.jdk.CollectionConverters.*
     revID.getExtraAttributes.asInstanceOf[java.util.Map[String, String]].asScala.toMap
   }
   private[sbt] def extra(
@@ -807,7 +807,7 @@ private[sbt] object IvySbt {
     javaMap(ea.extraAttributes, unqualify)
   }
   private[sbt] def javaMap(m: Map[String, String], unqualify: Boolean = false) = {
-    import scala.jdk.CollectionConverters._
+    import scala.jdk.CollectionConverters.*
     val map = if (unqualify) m map { case (k, v) => (k.stripPrefix("e:"), v) }
     else m
     if (map.isEmpty) null else map.asJava
@@ -830,7 +830,7 @@ private[sbt] object IvySbt {
     </ivy-module>
   }
   private def defaultInfo(module: ModuleID): scala.xml.Elem = {
-    import module._
+    import module.*
     val base = <info organisation={organization} module={name} revision={revision}/>
     branchName.fold(base) { br =>
       base % new scala.xml.UnprefixedAttribute("branch", br, scala.xml.Null)
@@ -960,7 +960,7 @@ private[sbt] object IvySbt {
       deps.put(id, updated)
     }
 
-    import scala.jdk.CollectionConverters._
+    import scala.jdk.CollectionConverters.*
     deps.values.asScala.toSeq.flatMap { dds =>
       val mergeable = dds.lazyZip(dds.tail).forall(ivyint.MergeDescriptors.mergeable)
       if (mergeable) dds.reverse.reduceLeft(ivyint.MergeDescriptors.apply) :: Nil else dds

lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala

@@ -14,17 +14,17 @@ import org.apache.ivy.core.module.descriptor.{
   DefaultModuleDescriptor,
   MDArtifact,
   ModuleDescriptor,
-  Artifact => IArtifact
+  Artifact as IArtifact
 }
 import org.apache.ivy.core.resolve.ResolveOptions
 import org.apache.ivy.plugins.resolver.{ BasicResolver, DependencyResolver }
-import org.apache.ivy.util.filter.{ Filter => IvyFilter }
+import org.apache.ivy.util.filter.{ Filter as IvyFilter }
 import sbt.io.{ IO, PathFinder }
 import sbt.util.Logger
-import sbt.librarymanagement.{ ModuleDescriptorConfiguration => InlineConfiguration, _ }
-import syntax._
-import InternalDefaults._
-import UpdateClassifiersUtil._
+import sbt.librarymanagement.{ ModuleDescriptorConfiguration as InlineConfiguration, * }
+import syntax.*
+import InternalDefaults.*
+import UpdateClassifiersUtil.*
 import sbt.internal.librarymanagement.IvyUtil.TransientNetworkException
 
 object IvyActions {
@@ -303,7 +303,7 @@ object IvyActions {
     val resolveOptions = new ResolveOptions
     val resolveId = ResolveOptions.getDefaultResolveId(moduleDescriptor)
     val artifactFilter = getArtifactTypeFilter(updateConfiguration.artifactFilter)
-    import updateConfiguration._
+    import updateConfiguration.*
     resolveOptions.setResolveId(resolveId)
     resolveOptions.setArtifactFilter(artifactFilter)
     resolveOptions.setUseCacheOnly(offline)
@@ -320,7 +320,7 @@ object IvyActions {
 
     val resolveReport = ivyInstance.resolve(moduleDescriptor, resolveOptions)
     if (resolveReport.hasError && !missingOk) {
-      import scala.jdk.CollectionConverters._
+      import scala.jdk.CollectionConverters.*
       // If strict error, collect report information and generated UnresolvedWarning
       val messages = resolveReport.getAllProblemMessages.asScala.toSeq.map(_.toString).distinct
       val failedPaths = resolveReport.getUnresolvedDependencies.map { node =>
@@ -362,7 +362,7 @@ object IvyActions {
     val resolveOptions = new ResolveOptions
     val resolveId = ResolveOptions.getDefaultResolveId(descriptor)
     val artifactFilter = getArtifactTypeFilter(updateConfiguration.artifactFilter)
-    import updateConfiguration._
+    import updateConfiguration.*
     resolveOptions.setResolveId(resolveId)
     resolveOptions.setArtifactFilter(artifactFilter)
     resolveOptions.setUseCacheOnly(offline)

lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala

@@ -10,13 +10,13 @@ import org.apache.ivy.core.cache.{
   CacheDownloadOptions,
   DefaultRepositoryCacheManager
 }
-import org.apache.ivy.core.module.descriptor.{ Artifact => IvyArtifact, DefaultArtifact }
-import org.apache.ivy.plugins.repository.file.{ FileRepository => IvyFileRepository, FileResource }
+import org.apache.ivy.core.module.descriptor.{ Artifact as IvyArtifact, DefaultArtifact }
+import org.apache.ivy.plugins.repository.file.{ FileRepository as IvyFileRepository, FileResource }
 import org.apache.ivy.plugins.repository.{ ArtifactResourceResolver, Resource, ResourceDownloader }
 import org.apache.ivy.plugins.resolver.util.ResolvedResource
 import org.apache.ivy.util.FileUtil
 import sbt.io.Path
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 import sbt.librarymanagement.ivy.{ InlineIvyConfiguration, IvyPaths }
 import sbt.util.Logger
 

lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyInternalDefaults.scala

@@ -2,9 +2,9 @@ package sbt
 package internal.librarymanagement
 
 import java.io.File
-import sbt.librarymanagement.ivy._
-import sbt.io.syntax._
-import xsbti.{ Logger => XLogger }
+import sbt.librarymanagement.ivy.*
+import sbt.io.syntax.*
+import xsbti.{ Logger as XLogger }
 import sbt.util.Logger
 
 /**

lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala

@@ -4,17 +4,17 @@
 package sbt.internal.librarymanagement
 
 import java.io.File
-import java.{ util => ju }
+import java.{ util as ju }
 import collection.mutable
 import collection.immutable.ArraySeq
 import org.apache.ivy.core.{ module, report, resolve }
-import module.descriptor.{ Artifact => IvyArtifact, License => IvyLicense }
-import module.id.{ ModuleRevisionId, ModuleId => IvyModuleId }
+import module.descriptor.{ Artifact as IvyArtifact, License as IvyLicense }
+import module.id.{ ModuleRevisionId, ModuleId as IvyModuleId }
 import report.{ ArtifactDownloadReport, ConfigurationResolveReport, ResolveReport }
 import resolve.{ IvyNode, IvyNodeCallers }
-import IvyNodeCallers.{ Caller => IvyCaller }
+import IvyNodeCallers.{ Caller as IvyCaller }
 import ivyint.SbtDefaultDependencyDescriptor
-import sbt.librarymanagement._, syntax._
+import sbt.librarymanagement.*, syntax.*
 
 object IvyRetrieve {
   def reports(report: ResolveReport): Vector[ConfigurationResolveReport] =
@@ -78,7 +78,7 @@ object IvyRetrieve {
   ): ModuleReport = {
     def toExtraAttributes(ea: ju.Map[?, ?]): Map[String, String] =
       Map(ea.entrySet.toArray collect {
-        case entry: ju.Map.Entry[_, _]
+        case entry: ju.Map.Entry[?, ?]
             if nonEmptyString(entry.getKey.toString).isDefined && nonEmptyString(
               entry.getValue.toString
             ).isDefined =>
@@ -217,7 +217,7 @@ object IvyRetrieve {
       .branch(nonEmptyString(revID.getBranch))
 
   def toArtifact(art: IvyArtifact): Artifact = {
-    import art._
+    import art.*
     Artifact(
       getName,
       getType,

lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyScalaUtil.scala

@@ -6,12 +6,12 @@ package sbt.internal.librarymanagement
 import java.util.Collections.emptyMap
 import scala.collection.mutable.HashSet
 
-import org.apache.ivy.core.module.descriptor._
+import org.apache.ivy.core.module.descriptor.*
 import org.apache.ivy.core.module.id.{ ArtifactId, ModuleId, ModuleRevisionId }
 import org.apache.ivy.plugins.matcher.ExactPatternMatcher
 import org.apache.ivy.plugins.namespace.NamespaceTransformer
 import sbt.util.Logger
-import sbt.librarymanagement.ScalaArtifacts._
+import sbt.librarymanagement.ScalaArtifacts.*
 import sbt.librarymanagement.{ Configuration, CrossVersion, ScalaModuleInfo }
 
 object IvyScalaUtil {

lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala

@@ -9,14 +9,14 @@ package sbt.internal.librarymanagement
 
 import java.io.File
 import sbt.util.Logger
-import sbt.librarymanagement._
-import Resolver._
+import sbt.librarymanagement.*
+import Resolver.*
 import mavenint.PomExtraDependencyAttributes
 
 import scala.collection.immutable.ArraySeq
 // Node needs to be renamed to XNode because the task subproject contains a Node type that will shadow
 // scala.xml.Node when generating aggregated API documentation
-import scala.xml.{ Elem, Node => XNode, NodeSeq, PrettyPrinter, PrefixedAttribute }
+import scala.xml.{ Elem, Node as XNode, NodeSeq, PrettyPrinter, PrefixedAttribute }
 import Configurations.Optional
 
 import org.apache.ivy.Ivy
@@ -42,7 +42,7 @@ object MakePom {
     VersionRange.fromIvyToMavenVersion(revision)
 }
 class MakePom(val log: Logger) {
-  import MakePom._
+  import MakePom.*
   def write(
       ivy: Ivy,
       module: ModuleDescriptor,
@@ -409,7 +409,7 @@ class MakePom(val log: Logger) {
 
   // cast the contents of a pre-generics collection
   private def castResolvers(s: java.util.Collection[?]): Seq[DependencyResolver] = {
-    import scala.jdk.CollectionConverters._
+    import scala.jdk.CollectionConverters.*
     s.asScala.toSeq.map(_.asInstanceOf[DependencyResolver])
   }
 

lm-ivy/src/main/scala/sbt/internal/librarymanagement/ProjectResolver.scala

@@ -11,7 +11,7 @@ import cache.ArtifactOrigin
 import search.{ ModuleEntry, OrganisationEntry, RevisionEntry }
 import module.id.ModuleRevisionId
 import module.descriptor.{
-  Artifact => IArtifact,
+  Artifact as IArtifact,
   DefaultArtifact,
   DependencyDescriptor,
   ModuleDescriptor

lm-ivy/src/main/scala/sbt/internal/librarymanagement/ResolutionCache.scala

@@ -11,7 +11,7 @@ import core.module.descriptor.ModuleDescriptor
 import ResolutionCache.{ Name, ReportDirectory, ResolvedName, ResolvedPattern }
 import parser.xml.XmlModuleDescriptorParser
 import sbt.io.IO
-import sbt.librarymanagement._
+import sbt.librarymanagement.*
 
 /**
  * Replaces the standard Ivy resolution cache in order to: