Skip to content

Commit fb22fe4

Browse files
committed
remove old scala3-staging
1 parent bdbac4a commit fb22fe4

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
@@ -1014,7 +1014,6 @@ object Build {
10141014
packageAll := {
10151015
(`scala3-compiler` / packageAll).value ++ Seq(
10161016
"scala3-compiler" -> (Compile / packageBin).value.getAbsolutePath,
1017-
"scala3-staging" -> (LocalProject("scala3-staging") / Compile / packageBin).value.getAbsolutePath,
10181017
"tasty-core" -> (LocalProject("tasty-core-bootstrapped") / Compile / packageBin).value.getAbsolutePath,
10191018
)
10201019
},
@@ -2865,16 +2864,6 @@ object Build {
28652864
case Bootstrapped => `tasty-core-bootstrapped`
28662865
}
28672866

2868-
lazy val `scala3-staging` = project.in(file("staging")).
2869-
withCommonSettings(Bootstrapped).
2870-
// We want the compiler to be present in the compiler classpath when compiling this project but not
2871-
// when compiling a project that depends on scala3-staging (see sbt-test/sbt-dotty/quoted-example-project),
2872-
// but we always need it to be present on the JVM classpath at runtime.
2873-
dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
2874-
settings(
2875-
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
2876-
)
2877-
28782867
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
28792868
.withCommonSettings(Bootstrapped)
28802869
.dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-library-bootstrapped-new`, `scala3-presentation-compiler-testcases` % "test->test")
@@ -3867,7 +3856,7 @@ object Build {
38673856
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
38683857
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
38693858
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
3870-
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`,
3859+
bootstrappedAggregate(`scala3-language-server`,
38713860
`scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
38723861
dependsOn(tastyCore).
38733862
dependsOn(dottyCompiler).

0 commit comments

Comments
 (0)