From 222410009b6c8bab08e30fe6fb468338eb3e929c Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Tue, 26 Mar 2024 16:17:07 +0100 Subject: [PATCH] fix no-scala-tool --- main/src/main/scala/sbt/Defaults.scala | 3 ++- sbt-app/src/sbt-test/java/no-scala-tool/{pending => test} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename sbt-app/src/sbt-test/java/no-scala-tool/{pending => test} (100%) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index b8e999ccd..b52fca223 100644 --- 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), diff --git a/sbt-app/src/sbt-test/java/no-scala-tool/pending b/sbt-app/src/sbt-test/java/no-scala-tool/test similarity index 100% rename from sbt-app/src/sbt-test/java/no-scala-tool/pending rename to sbt-app/src/sbt-test/java/no-scala-tool/test