From df0b96b5eb3d7b58eb0ae0333be3ca1c36a0bda0 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 13 Dec 2023 11:16:29 -0500 Subject: [PATCH 1/3] IO 1.9.8 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fda160d24e..6403e474a4 100644 --- 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") From cd6e992fe3bf754fce05b3c1df42e0f6fe1ade7f Mon Sep 17 00:00:00 2001 From: Aleksandra Zdrojowa Date: Tue, 21 Nov 2023 14:52:34 +0100 Subject: [PATCH 2/3] pass classifiersModule configurations to ModuleDescriptorConfiguration --- main/src/main/scala/sbt/internal/LibraryManagement.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/internal/LibraryManagement.scala b/main/src/main/scala/sbt/internal/LibraryManagement.scala index 220115e6ab..9a0f0d362e 100644 --- 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) => From 7762dd2a173fa326b8ff535b938005ce02eb35aa Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 4 Dec 2023 10:51:27 +0100 Subject: [PATCH 3/3] Add missing logger methods that take Java Supplier --- internal/util-logging/src/main/scala/sbt/util/Logger.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/util-logging/src/main/scala/sbt/util/Logger.scala b/internal/util-logging/src/main/scala/sbt/util/Logger.scala index 978a36323a..c407f409a8 100644 --- 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) }