diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 64bf2dcef..973f01d7f 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -995,7 +995,7 @@ object Defaults extends BuildCommon { Vector( "-Ypickle-java", "-Ypickle-write", - converter.toPath(earlyOutput.value).toString + earlyOutput.value.toString ) ++ old else old }, @@ -4221,18 +4221,19 @@ object Classpaths { given FileConverter = converter (base * (filter -- excl) +++ (base / config.name).descendantsExcept(filter, excl)).classpath - def autoPlugins( + private def autoPlugins( report: UpdateReport, internalPluginClasspath: Seq[NioPath], isDotty: Boolean - ): Seq[String] = + )(using conv: FileConverter): Seq[String] = import sbt.internal.inc.classpath.ClasspathUtil.compilerPlugins val pluginClasspath = report .matching(configurationFilter(CompilerPlugin.name)) .map(_.toPath) ++ internalPluginClasspath val plugins = compilerPlugins(pluginClasspath, isDotty) - plugins.map("-Xplugin:" + _.toAbsolutePath.toString).toSeq + plugins.toVector.map: p => + "-Xplugin:" + conv.toVirtualFile(p).toString() private lazy val internalCompilerPluginClasspath: Initialize[Task[Classpath]] = (Def diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f464301d0..4c49f44eb 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { // sbt modules private val ioVersion = nightlyVersion.getOrElse("1.10.4") - val zincVersion = nightlyVersion.getOrElse("2.0.0-M3") + val zincVersion = nightlyVersion.getOrElse("2.0.0-M4") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion