fix no-scala-tool

2024-03-26 16:17:07 +01:00 · 2024-03-26 16:17:07 +01:00 · 222410009b
parent 9c425ea581
commit 222410009b
2 changed files with 2 additions and 1 deletions
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@ -724,7 +724,8 @@ object Defaults extends BuildCommon {
    clean := clean.dependsOnTask(cleanIvy).value,
    scalaCompilerBridgeBinaryJar := Def.settingDyn {
      val sv = scalaVersion.value
-      if (ScalaArtifacts.isScala3(sv)) fetchBridgeBinaryJarTask(sv)
+      val managed = managedScalaInstance.value
+      if (ScalaArtifacts.isScala3(sv) && managed) fetchBridgeBinaryJarTask(sv)
      else Def.task[Option[File]](None)
    }.value,
    scalaCompilerBridgeSource := ZincLmUtil.getDefaultBridgeSourceModule(scalaVersion.value),
--- a/sbt-app/src/sbt-test/java/no-scala-tool/pending
+++ b/sbt-app/src/sbt-test/java/no-scala-tool/pending