Skip to content

Commit 0f0a663

Browse files
committed
Don't download the scala3-sbt-bridge artifact when --server=false
1 parent 70a3b16 commit 0f0a663

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,8 @@ final case class SharedOptions(
438438
python = sharedPython.python,
439439
pythonSetup = sharedPython.pythonSetup,
440440
scalaPyVersion = sharedPython.scalaPyVersion
441-
)
441+
),
442+
useBuildServer = compilationServer.server
442443
)
443444
}
444445

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
608608
val localRepoPath = root / "local-repo"
609609
val sv = "3.4.1-RC1"
610610
val artifactNames =
611-
Seq("scala3-compiler_3", "scala3-sbt-bridge")
611+
Seq("scala3-compiler_3") ++ (if (withBloop) Seq("scala3-sbt-bridge") else Nil)
612612
for { artifactName <- artifactNames } {
613613
val csRes = os.proc(
614614
TestUtil.cs,

modules/options/src/main/scala/scala/build/Artifacts.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ object Artifacts {
104104
addJmhDependencies: Option[String],
105105
extraRepositories: Seq[Repository],
106106
keepResolution: Boolean,
107+
includeBuildServerDeps: Boolean,
107108
cache: FileCache[Task],
108109
logger: Logger,
109110
maybeRecoverOnError: BuildException => Option[BuildException]
@@ -176,7 +177,9 @@ object Artifacts {
176177
).left.flatMap(_.maybeRecoverWithDefault(Seq.empty, maybeRecoverOnError))
177178
}
178179

179-
val bridgeJarsOpt = Option.when(scalaArtifactsParams.params.scalaVersion.startsWith("3.")) {
180+
val bridgeJarsOpt = Option.when(
181+
scalaArtifactsParams.params.scalaVersion.startsWith("3.") && includeBuildServerDeps
182+
) {
180183
Seq(dep"org.scala-lang:scala3-sbt-bridge:${scalaArtifactsParams.params.scalaVersion}")
181184
}.map { bridgeDependencies =>
182185
value {

modules/options/src/main/scala/scala/build/options/BuildOptions.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ final case class BuildOptions(
4444
mainClass: Option[String] = None,
4545
testOptions: TestOptions = TestOptions(),
4646
notForBloopOptions: PostBuildOptions = PostBuildOptions(),
47-
sourceGeneratorOptions: SourceGeneratorOptions = SourceGeneratorOptions()
47+
sourceGeneratorOptions: SourceGeneratorOptions = SourceGeneratorOptions(),
48+
useBuildServer: Option[Boolean] = None
4849
) {
4950

5051
import BuildOptions.JavaHomeInfo
@@ -457,6 +458,7 @@ final case class BuildOptions(
457458
addJmhDependencies = jmhOptions.addJmhDependencies,
458459
extraRepositories = value(finalRepositories),
459460
keepResolution = internal.keepResolution,
461+
includeBuildServerDeps = useBuildServer.getOrElse(false),
460462
cache = finalCache,
461463
logger = logger,
462464
maybeRecoverOnError = maybeRecoverOnError

0 commit comments

Comments
 (0)