Skip to content

Commit a1a0971

Browse files
hamzaremmalWojciechMazur
authored andcommitted
remove old scala3-tasty-inspector
[Cherry-picked bdbac4a]
1 parent 0ca9616 commit a1a0971

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ val `scala3-sbt-bridge-bootstrapped` = Build.`scala3-sbt-bridge-bootstrapped`
2121
val `scala3-sbt-bridge-nonbootstrapped` = Build.`scala3-sbt-bridge-nonbootstrapped`
2222
val `scala3-staging` = Build.`scala3-staging`
2323
val `scala3-staging-new` = Build.`scala3-staging-new`
24-
val `scala3-tasty-inspector` = Build.`scala3-tasty-inspector`
2524
val `scala3-tasty-inspector-new` = Build.`scala3-tasty-inspector-new`
2625
val `scala3-language-server` = Build.`scala3-language-server`
2726
//val `scala3-bench` = Build.`scala3-bench`

project/Build.scala

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,6 @@ object Build {
10471047
(`scala3-compiler` / packageAll).value ++ Seq(
10481048
"scala3-compiler" -> (Compile / packageBin).value.getAbsolutePath,
10491049
"scala3-staging" -> (LocalProject("scala3-staging") / Compile / packageBin).value.getAbsolutePath,
1050-
"scala3-tasty-inspector" -> (LocalProject("scala3-tasty-inspector") / Compile / packageBin).value.getAbsolutePath,
10511050
"tasty-core" -> (LocalProject("tasty-core-bootstrapped") / Compile / packageBin).value.getAbsolutePath,
10521051
)
10531052
},
@@ -2936,16 +2935,6 @@ object Build {
29362935
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
29372936
)
29382937

2939-
lazy val `scala3-tasty-inspector` = project.in(file("tasty-inspector")).
2940-
withCommonSettings(Bootstrapped).
2941-
// We want the compiler to be present in the compiler classpath when compiling this project but not
2942-
// when compiling a project that depends on scala3-tasty-inspector (see sbt-test/sbt-dotty/tasty-inspector-example-project),
2943-
// but we always need it to be present on the JVM classpath at runtime.
2944-
dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
2945-
settings(
2946-
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
2947-
)
2948-
29492938
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
29502939
.withCommonSettings(Bootstrapped)
29512940
.dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-library-bootstrapped-new`, `scala3-presentation-compiler-testcases` % "test->test")
@@ -3500,7 +3489,7 @@ object Build {
35003489
configs(SourceLinksIntegrationTest).
35013490
settings(commonBootstrappedSettings).
35023491
dependsOn(`scala3-compiler-bootstrapped`).
3503-
dependsOn(`scala3-tasty-inspector`).
3492+
dependsOn(`scala3-tasty-inspector-new`).
35043493
settings(inConfig(SourceLinksIntegrationTest)(Defaults.testSettings)).
35053494
settings(
35063495
SourceLinksIntegrationTest / scalaSource := baseDirectory.value / "test-source-links",
@@ -3938,8 +3927,8 @@ object Build {
39383927
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
39393928
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
39403929
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
3941-
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`,
3942-
`scala3-tasty-inspector`, `scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
3930+
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`,
3931+
`scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
39433932
dependsOn(tastyCore).
39443933
dependsOn(dottyCompiler).
39453934
dependsOn(dottyLibrary).

0 commit comments

Comments
 (0)