Skip to content

Commit eed40ca

Browse files
hamzaremmalWojciechMazur
authored andcommitted
remove old scala3-staging
[Cherry-picked fb22fe4]
1 parent a1a0971 commit eed40ca

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
1919
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
2020
val `scala3-sbt-bridge-bootstrapped` = Build.`scala3-sbt-bridge-bootstrapped`
2121
val `scala3-sbt-bridge-nonbootstrapped` = Build.`scala3-sbt-bridge-nonbootstrapped`
22-
val `scala3-staging` = Build.`scala3-staging`
2322
val `scala3-staging-new` = Build.`scala3-staging-new`
2423
val `scala3-tasty-inspector-new` = Build.`scala3-tasty-inspector-new`
2524
val `scala3-language-server` = Build.`scala3-language-server`

project/Build.scala

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,6 @@ object Build {
10461046
packageAll := {
10471047
(`scala3-compiler` / packageAll).value ++ Seq(
10481048
"scala3-compiler" -> (Compile / packageBin).value.getAbsolutePath,
1049-
"scala3-staging" -> (LocalProject("scala3-staging") / Compile / packageBin).value.getAbsolutePath,
10501049
"tasty-core" -> (LocalProject("tasty-core-bootstrapped") / Compile / packageBin).value.getAbsolutePath,
10511050
)
10521051
},
@@ -2925,16 +2924,6 @@ object Build {
29252924
case Bootstrapped => `tasty-core-bootstrapped`
29262925
}
29272926

2928-
lazy val `scala3-staging` = project.in(file("staging")).
2929-
withCommonSettings(Bootstrapped).
2930-
// We want the compiler to be present in the compiler classpath when compiling this project but not
2931-
// when compiling a project that depends on scala3-staging (see sbt-test/sbt-dotty/quoted-example-project),
2932-
// but we always need it to be present on the JVM classpath at runtime.
2933-
dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
2934-
settings(
2935-
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
2936-
)
2937-
29382927
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
29392928
.withCommonSettings(Bootstrapped)
29402929
.dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-library-bootstrapped-new`, `scala3-presentation-compiler-testcases` % "test->test")
@@ -3927,7 +3916,7 @@ object Build {
39273916
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
39283917
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
39293918
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
3930-
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`,
3919+
bootstrappedAggregate(`scala3-language-server`,
39313920
`scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
39323921
dependsOn(tastyCore).
39333922
dependsOn(dottyCompiler).

0 commit comments

Comments
 (0)