Skip to content

Commit 0ca9616

Browse files
hamzaremmalWojciechMazur
authored andcommitted
remove old sbt-bridge
[Cherry-picked 916e00f]
1 parent 73b8563 commit 0ca9616

File tree

2 files changed

+2
-37
lines changed

2 files changed

+2
-37
lines changed

build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ val `scala3-library-bootstrapped-new` = Build.`scala3-library-bootstrapped-new`
1717
val `scala3-library` = Build.`scala3-library`
1818
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
1919
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
20-
val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
2120
val `scala3-sbt-bridge-bootstrapped` = Build.`scala3-sbt-bridge-bootstrapped`
2221
val `scala3-sbt-bridge-nonbootstrapped` = Build.`scala3-sbt-bridge-nonbootstrapped`
23-
val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`
2422
val `scala3-staging` = Build.`scala3-staging`
2523
val `scala3-staging-new` = Build.`scala3-staging-new`
2624
val `scala3-tasty-inspector` = Build.`scala3-tasty-inspector`

project/Build.scala

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ object Build {
557557
scalaVersion := dottyNonBootstrappedVersion,
558558

559559
scalaCompilerBridgeBinaryJar := {
560-
Some((`scala3-sbt-bridge` / Compile / packageBin).value)
560+
Some((`scala3-sbt-bridge-nonbootstrapped` / Compile / packageBin).value)
561561
},
562562

563563
// Use the same name as the non-bootstrapped projects for the artifacts.
@@ -2946,39 +2946,6 @@ object Build {
29462946
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
29472947
)
29482948

2949-
lazy val `scala3-sbt-bridge` = project.in(file("sbt-bridge/src")).
2950-
// We cannot depend on any bootstrapped project to compile the bridge, since the
2951-
// bridge is needed to compile these projects.
2952-
dependsOn(`scala3-compiler` % Provided).
2953-
settings(commonJavaSettings).
2954-
settings(
2955-
description := "sbt compiler bridge for Dotty",
2956-
2957-
Test / sources := Seq(),
2958-
Compile / scalaSource := baseDirectory.value,
2959-
Compile / javaSource := baseDirectory.value,
2960-
Compile / resourceDirectory := baseDirectory.value.getParentFile / "resources",
2961-
2962-
// Referring to the other project using a string avoids an infinite loop
2963-
// when sbt reads the settings.
2964-
Test / test := (LocalProject("scala3-sbt-bridge-tests") / Test / test).value,
2965-
2966-
libraryDependencies += Dependencies.compilerInterface % Provided
2967-
)
2968-
2969-
// We use a separate project for the bridge tests since they can only be run
2970-
// with the bootstrapped library on the classpath.
2971-
lazy val `scala3-sbt-bridge-tests` = project.in(file("sbt-bridge/test")).
2972-
dependsOn(dottyCompiler(Bootstrapped) % Test).
2973-
dependsOn(`scala3-sbt-bridge`).
2974-
settings(commonBootstrappedSettings).
2975-
settings(
2976-
Compile / sources := Seq(),
2977-
Test / scalaSource := baseDirectory.value,
2978-
Test / javaSource := baseDirectory.value,
2979-
libraryDependencies += ("org.scala-sbt" %% "zinc-apiinfo" % "1.8.0" % Test).cross(CrossVersion.for3Use2_13)
2980-
)
2981-
29822949
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
29832950
.withCommonSettings(Bootstrapped)
29842951
.dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-library-bootstrapped-new`, `scala3-presentation-compiler-testcases` % "test->test")
@@ -3970,7 +3937,7 @@ object Build {
39703937

39713938
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
39723939
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
3973-
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, `scala3-sbt-bridge`).
3940+
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
39743941
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`,
39753942
`scala3-tasty-inspector`, `scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
39763943
dependsOn(tastyCore).

0 commit comments

Comments
 (0)