Merge pull request #7457 from eed3si9n/wip/1.9.8

Update IO to 1.9.8 + some backports
sbt · Dec 13, 2023 · 1b31fa7 · 1b31fa7
2 parents edc1029 + 7762dd2
commit 1b31fa7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/internal/util-logging/src/main/scala/sbt/util/Logger.scala b/internal/util-logging/src/main/scala/sbt/util/Logger.scala
@@ -40,11 +40,13 @@ abstract class Logger extends xLogger {
   def success(message: => String): Unit
   def log(level: Level.Value, message: => String): Unit
 
+  def verbose(msg: Supplier[String]): Unit = debug(msg)
   def debug(msg: Supplier[String]): Unit = log(Level.Debug, msg)
   def warn(msg: Supplier[String]): Unit = log(Level.Warn, msg)
   def info(msg: Supplier[String]): Unit = log(Level.Info, msg)
   def error(msg: Supplier[String]): Unit = log(Level.Error, msg)
   def trace(msg: Supplier[Throwable]): Unit = trace(msg.get())
+  def success(msg: Supplier[String]): Unit = success(msg.get())
   def log(level: Level.Value, msg: Supplier[String]): Unit = log(level, msg.get)
 }
 

diff --git a/main/src/main/scala/sbt/internal/LibraryManagement.scala b/main/src/main/scala/sbt/internal/LibraryManagement.scala
@@ -185,7 +185,11 @@ private[sbt] object LibraryManagement {
     import config.{ updateConfiguration => c, module => mod }
     import mod.{ id, dependencies => deps, scalaModuleInfo }
     val base = restrictedCopy(id, true).withName(id.name + "$" + label)
-    val module = lm.moduleDescriptor(base, deps, scalaModuleInfo)
+    val moduleSettings = ModuleDescriptorConfiguration(base, ModuleInfo(base.name))
+      .withScalaModuleInfo(scalaModuleInfo)
+      .withDependencies(deps)
+      .withConfigurations(mod.configurations)
+    val module = lm.moduleDescriptor(moduleSettings)
     val report = lm.update(module, c, uwconfig, log) match {
       case Right(r) => r
       case Left(w) =>

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -12,7 +12,7 @@ object Dependencies {
     sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version")
 
   // sbt modules
-  private val ioVersion = nightlyVersion.getOrElse("1.9.7")
+  private val ioVersion = nightlyVersion.getOrElse("1.9.8")
   private val lmVersion =
     sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.9.3")
   val zincVersion = nightlyVersion.getOrElse("1.9.5")