Skip to content

Commit 916e00f

Browse files
committed
remove old sbt-bridge
1 parent aa8a7b6 commit 916e00f

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
@@ -525,7 +525,7 @@ object Build {
525525
scalaVersion := dottyNonBootstrappedVersion,
526526

527527
scalaCompilerBridgeBinaryJar := {
528-
Some((`scala3-sbt-bridge` / Compile / packageBin).value)
528+
Some((`scala3-sbt-bridge-nonbootstrapped` / Compile / packageBin).value)
529529
},
530530

531531
// Use the same name as the non-bootstrapped projects for the artifacts.
@@ -2886,39 +2886,6 @@ object Build {
28862886
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
28872887
)
28882888

2889-
lazy val `scala3-sbt-bridge` = project.in(file("sbt-bridge/src")).
2890-
// We cannot depend on any bootstrapped project to compile the bridge, since the
2891-
// bridge is needed to compile these projects.
2892-
dependsOn(`scala3-compiler` % Provided).
2893-
settings(commonJavaSettings).
2894-
settings(
2895-
description := "sbt compiler bridge for Dotty",
2896-
2897-
Test / sources := Seq(),
2898-
Compile / scalaSource := baseDirectory.value,
2899-
Compile / javaSource := baseDirectory.value,
2900-
Compile / resourceDirectory := baseDirectory.value.getParentFile / "resources",
2901-
2902-
// Referring to the other project using a string avoids an infinite loop
2903-
// when sbt reads the settings.
2904-
Test / test := (LocalProject("scala3-sbt-bridge-tests") / Test / test).value,
2905-
2906-
libraryDependencies += Dependencies.compilerInterface % Provided
2907-
)
2908-
2909-
// We use a separate project for the bridge tests since they can only be run
2910-
// with the bootstrapped library on the classpath.
2911-
lazy val `scala3-sbt-bridge-tests` = project.in(file("sbt-bridge/test")).
2912-
dependsOn(dottyCompiler(Bootstrapped) % Test).
2913-
dependsOn(`scala3-sbt-bridge`).
2914-
settings(commonBootstrappedSettings).
2915-
settings(
2916-
Compile / sources := Seq(),
2917-
Test / scalaSource := baseDirectory.value,
2918-
Test / javaSource := baseDirectory.value,
2919-
libraryDependencies += ("org.scala-sbt" %% "zinc-apiinfo" % "1.8.0" % Test).cross(CrossVersion.for3Use2_13)
2920-
)
2921-
29222889
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
29232890
.withCommonSettings(Bootstrapped)
29242891
.dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-library-bootstrapped-new`, `scala3-presentation-compiler-testcases` % "test->test")
@@ -3910,7 +3877,7 @@ object Build {
39103877

39113878
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
39123879
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
3913-
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, `scala3-sbt-bridge`).
3880+
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
39143881
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`,
39153882
`scala3-tasty-inspector`, `scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
39163883
dependsOn(tastyCore).

0 commit comments

Comments
 (0)