File tree Expand file tree Collapse file tree 4 files changed +10
-4
lines changed
cli/src/main/scala/scala/cli/commands/shared
integration/src/test/scala/scala/cli/integration
options/src/main/scala/scala/build Expand file tree Collapse file tree 4 files changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -438,7 +438,8 @@ final case class SharedOptions(
438
438
python = sharedPython.python,
439
439
pythonSetup = sharedPython.pythonSetup,
440
440
scalaPyVersion = sharedPython.scalaPyVersion
441
- )
441
+ ),
442
+ useBuildServer = compilationServer.server
442
443
)
443
444
}
444
445
Original file line number Diff line number Diff line change @@ -608,7 +608,7 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
608
608
val localRepoPath = root / " local-repo"
609
609
val sv = " 3.4.1-RC1"
610
610
val artifactNames =
611
- Seq (" scala3-compiler_3" , " scala3-sbt-bridge" )
611
+ Seq (" scala3-compiler_3" ) ++ ( if (withBloop) Seq ( " scala3-sbt-bridge" ) else Nil )
612
612
for { artifactName <- artifactNames } {
613
613
val csRes = os.proc(
614
614
TestUtil .cs,
Original file line number Diff line number Diff line change @@ -104,6 +104,7 @@ object Artifacts {
104
104
addJmhDependencies : Option [String ],
105
105
extraRepositories : Seq [Repository ],
106
106
keepResolution : Boolean ,
107
+ includeBuildServerDeps : Boolean ,
107
108
cache : FileCache [Task ],
108
109
logger : Logger ,
109
110
maybeRecoverOnError : BuildException => Option [BuildException ]
@@ -176,7 +177,9 @@ object Artifacts {
176
177
).left.flatMap(_.maybeRecoverWithDefault(Seq .empty, maybeRecoverOnError))
177
178
}
178
179
179
- val bridgeJarsOpt = Option .when(scalaArtifactsParams.params.scalaVersion.startsWith(" 3." )) {
180
+ val bridgeJarsOpt = Option .when(
181
+ scalaArtifactsParams.params.scalaVersion.startsWith(" 3." ) && includeBuildServerDeps
182
+ ) {
180
183
Seq (dep " org.scala-lang:scala3-sbt-bridge: ${scalaArtifactsParams.params.scalaVersion}" )
181
184
}.map { bridgeDependencies =>
182
185
value {
Original file line number Diff line number Diff line change @@ -44,7 +44,8 @@ final case class BuildOptions(
44
44
mainClass : Option [String ] = None ,
45
45
testOptions : TestOptions = TestOptions (),
46
46
notForBloopOptions : PostBuildOptions = PostBuildOptions (),
47
- sourceGeneratorOptions : SourceGeneratorOptions = SourceGeneratorOptions ()
47
+ sourceGeneratorOptions : SourceGeneratorOptions = SourceGeneratorOptions (),
48
+ useBuildServer : Option [Boolean ] = None
48
49
) {
49
50
50
51
import BuildOptions .JavaHomeInfo
@@ -457,6 +458,7 @@ final case class BuildOptions(
457
458
addJmhDependencies = jmhOptions.addJmhDependencies,
458
459
extraRepositories = value(finalRepositories),
459
460
keepResolution = internal.keepResolution,
461
+ includeBuildServerDeps = useBuildServer.getOrElse(false ),
460
462
cache = finalCache,
461
463
logger = logger,
462
464
maybeRecoverOnError = maybeRecoverOnError
You can’t perform that action at this time.
0 commit comments