@@ -1374,25 +1374,21 @@ object Build {
13741374 )
13751375
13761376 lazy val `scala3-presentation-compiler` = project.in(file(" presentation-compiler" ))
1377- .asScala3PresentationCompiler(NonBootstrapped )
1378- lazy val `scala3-presentation-compiler-bootstrapped` = project.in(file(" presentation-compiler" ))
1379- .asScala3PresentationCompiler(Bootstrapped )
1377+ .withCommonSettings(Bootstrapped )
1378+ .dependsOn(`scala3-compiler-bootstrapped`, `scala3-library-bootstrapped`)
1379+ .settings(presentationCompilerSettings)
1380+ .settings(scala3PresentationCompilerBuildInfo)
13801381 .settings(
13811382 // Add `-Yno-flexible-types` flag for bootstrap, see comments for `bootstrappedDottyCompilerSettings`
13821383 Compile / scalacOptions += " -Yno-flexible-types"
13831384 )
13841385
1385- def scala3PresentationCompiler (implicit mode : Mode ): Project = mode match {
1386- case NonBootstrapped => `scala3-presentation-compiler`
1387- case Bootstrapped => `scala3-presentation-compiler-bootstrapped`
1388- }
1389-
1390- def scala3PresentationCompilerBuildInfo (implicit mode : Mode ) =
1386+ def scala3PresentationCompilerBuildInfo =
13911387 Seq (
13921388 ideTestsDependencyClasspath := {
1393- val dottyLib = (dottyLibrary / Compile / classDirectory).value
1389+ val dottyLib = (`scala3-library-bootstrapped` / Compile / classDirectory).value
13941390 val scalaLib =
1395- (dottyLibrary / Compile / dependencyClasspath)
1391+ (`scala3-library-bootstrapped` / Compile / dependencyClasspath)
13961392 .value
13971393 .map(_.data)
13981394 .filter(_.getName.matches(" scala-library.*\\ .jar" ))
@@ -2284,9 +2280,9 @@ object Build {
22842280
22852281 // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
22862282 def asDottyRoot (implicit mode : Mode ): Project = project.withCommonSettings.
2287- aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, `scala3-sbt-bridge`, scala3PresentationCompiler ).
2283+ aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, `scala3-sbt-bridge`).
22882284 bootstrappedAggregate(`scala2-library-tasty`, `scala2-library-cc-tasty`, `scala3-language-server`, `scala3-staging`,
2289- `scala3-tasty-inspector`, `scala3-library-bootstrappedJS`, scaladoc).
2285+ `scala3-tasty-inspector`, `scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler` ).
22902286 dependsOn(tastyCore).
22912287 dependsOn(dottyCompiler).
22922288 dependsOn(dottyLibrary).
@@ -2396,11 +2392,6 @@ object Build {
23962392 settings(commonBenchmarkSettings).
23972393 enablePlugins(JmhPlugin )
23982394
2399- def asScala3PresentationCompiler (implicit mode : Mode ): Project = project.withCommonSettings.
2400- dependsOn(dottyCompiler, dottyLibrary).
2401- settings(presentationCompilerSettings).
2402- settings(scala3PresentationCompilerBuildInfo)
2403-
24042395 def asDist (implicit mode : Mode ): Project = project.
24052396 enablePlugins(UniversalPlugin , RepublishPlugin ).
24062397 withCommonSettings.
0 commit comments