Skip to content

Commit 0207448

Browse files
committed
chore: presentation compiler will depend on the new projects
Note that it is still compiled in this commit with the previous compiler artifacts. This will be dropped in an upcoming commit.
1 parent b10f71b commit 0207448

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

project/Build.scala

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2925,23 +2925,16 @@ object Build {
29252925

29262926
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
29272927
.withCommonSettings(Bootstrapped)
2928-
.dependsOn(`scala3-compiler-bootstrapped`, `scala3-library-bootstrapped`, `scala3-presentation-compiler-testcases` % "test->test")
2928+
.dependsOn(`scala3-compiler-bootstrapped-new`, `scala3-library-bootstrapped-new`, `scala3-presentation-compiler-testcases` % "test->test")
29292929
.settings(presentationCompilerSettings)
29302930
.settings(scala3PresentationCompilerBuildInfo)
29312931

29322932
def scala3PresentationCompilerBuildInfo =
29332933
Seq(
29342934
ideTestsDependencyClasspath := {
29352935
val testCasesLib = (`scala3-presentation-compiler-testcases` / Compile / classDirectory).value
2936-
val dottyLib = (`scala3-library-bootstrapped` / Compile / classDirectory).value
2937-
val scalaLib =
2938-
(`scala3-library-bootstrapped` / Compile / dependencyClasspath)
2939-
.value
2940-
.map(_.data)
2941-
.filter(_.getName.matches("scala-library.*\\.jar"))
2942-
.toList
2943-
testCasesLib :: dottyLib :: scalaLib
2944-
// Nil
2936+
val dottyLib = (`scala-library-bootstrapped` / Compile / classDirectory).value
2937+
testCasesLib :: dottyLib :: Nil
29452938
},
29462939
Compile / buildInfoPackage := "dotty.tools.pc.buildinfo",
29472940
Compile / buildInfoKeys := Seq(scalaVersion),
@@ -2965,8 +2958,9 @@ object Build {
29652958
transitiveClassifiers := Seq("sources"),
29662959
scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings
29672960
publishLocal := publishLocal.dependsOn( // It is best to publish all together. It is not rare to make changes in both compiler / presentation compiler and it can get misaligned
2968-
`scala3-compiler-bootstrapped` / publishLocal,
2969-
`scala3-library-bootstrapped` / publishLocal,
2961+
`scala3-compiler-bootstrapped-new` / publishLocal,
2962+
`scala3-library-bootstrapped-new` / publishLocal,
2963+
`scala-library-bootstrapped` / publishLocal,
29702964
).value,
29712965
Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Wsafe-init"),
29722966
Compile / sourceGenerators += Def.task {

0 commit comments

Comments
 (0)