Skip to content

Commit bdbac4a

Browse files
committed
remove old scala3-tasty-inspector
1 parent 916e00f commit bdbac4a

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
@@ -1015,7 +1015,6 @@ object Build {
10151015
(`scala3-compiler` / packageAll).value ++ Seq(
10161016
"scala3-compiler" -> (Compile / packageBin).value.getAbsolutePath,
10171017
"scala3-staging" -> (LocalProject("scala3-staging") / Compile / packageBin).value.getAbsolutePath,
1018-
"scala3-tasty-inspector" -> (LocalProject("scala3-tasty-inspector") / Compile / packageBin).value.getAbsolutePath,
10191018
"tasty-core" -> (LocalProject("tasty-core-bootstrapped") / Compile / packageBin).value.getAbsolutePath,
10201019
)
10211020
},
@@ -2876,16 +2875,6 @@ object Build {
28762875
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
28772876
)
28782877

2879-
lazy val `scala3-tasty-inspector` = project.in(file("tasty-inspector")).
2880-
withCommonSettings(Bootstrapped).
2881-
// We want the compiler to be present in the compiler classpath when compiling this project but not
2882-
// when compiling a project that depends on scala3-tasty-inspector (see sbt-test/sbt-dotty/tasty-inspector-example-project),
2883-
// but we always need it to be present on the JVM classpath at runtime.
2884-
dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
2885-
settings(
2886-
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
2887-
)
2888-
28892878
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
28902879
.withCommonSettings(Bootstrapped)
28912880
.dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-library-bootstrapped-new`, `scala3-presentation-compiler-testcases` % "test->test")
@@ -3440,7 +3429,7 @@ object Build {
34403429
configs(SourceLinksIntegrationTest).
34413430
settings(commonBootstrappedSettings).
34423431
dependsOn(`scala3-compiler-bootstrapped`).
3443-
dependsOn(`scala3-tasty-inspector`).
3432+
dependsOn(`scala3-tasty-inspector-new`).
34443433
settings(inConfig(SourceLinksIntegrationTest)(Defaults.testSettings)).
34453434
settings(
34463435
SourceLinksIntegrationTest / scalaSource := baseDirectory.value / "test-source-links",
@@ -3878,8 +3867,8 @@ object Build {
38783867
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
38793868
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
38803869
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
3881-
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`,
3882-
`scala3-tasty-inspector`, `scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
3870+
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`,
3871+
`scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
38833872
dependsOn(tastyCore).
38843873
dependsOn(dottyCompiler).
38853874
dependsOn(dottyLibrary).

0 commit comments

Comments
 (0)