Skip to content

Commit 908a9d2

Browse files
committed
Fix build setup to handle 2 failing scala2-compat sbt scripted tests
1 parent 87a2f49 commit 908a9d2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

project/Build.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ object Build {
686686
// ================================= NON-BOOTSTRAPPED PROJECTS ==================================
687687
// ==============================================================================================
688688

689-
lazy val `scala3-nonbootstrapped` = project
689+
lazy val `scala3-nonbootstrapped` = project.in(file("."))
690690
.aggregate(`scala3-interfaces`, `scala3-library-nonbootstrapped` , `scala-library-nonbootstrapped`,
691691
`tasty-core-nonbootstrapped`, `scala3-compiler-nonbootstrapped`, `scala3-sbt-bridge-nonbootstrapped`)
692692
.settings(
@@ -848,7 +848,7 @@ object Build {
848848
// Nothing to be published by this project
849849
publish / skip := true,
850850
// Project specific target folder. sbt doesn't like having two projects using the same target folder
851-
target := target.value / "scala3-bootstrapped",
851+
target := (ThisBuild / baseDirectory).value / "target" / "scala3-bootstrapped",
852852
scalac := Def.inputTaskDyn {
853853
val log = streams.value.log
854854
val externalDeps = (`scala3-compiler-bootstrapped-new` / Runtime / externalDependencyClasspath).value
@@ -1316,6 +1316,8 @@ object Build {
13161316
Test / doc := (`scala-library-nonbootstrapped` / Test / doc).value,
13171317
Test / run := (`scala-library-nonbootstrapped` / Test / run).evaluated,
13181318
Test / test := (`scala-library-nonbootstrapped` / Test / test).value,
1319+
// Claim that the classes generated by this project are the same as the one we get from `scala-library-nonbootstrapped`
1320+
Compile / classDirectory := (`scala-library-nonbootstrapped` / Compile / classDirectory).value,
13191321
// Packaging configuration of the stdlib
13201322
Compile / packageBin / publishArtifact := true,
13211323
Compile / packageDoc / publishArtifact := false,
@@ -1446,6 +1448,8 @@ object Build {
14461448
Test / compile := (`scala-library-bootstrapped` / Test / compile).value,
14471449
Test / doc := (`scala-library-bootstrapped` / Test / doc).value,
14481450
Test / run := (`scala-library-bootstrapped` / Test / run).evaluated,
1451+
// Claim that the classes generated by this project are the same as the one we get from `scala-library-bootstrapped`
1452+
Compile / classDirectory := (`scala-library-bootstrapped` / Compile / classDirectory).value,
14491453
// Packaging configuration of the stdlib
14501454
Compile / packageBin / publishArtifact := true,
14511455
Compile / packageDoc / publishArtifact := false,

0 commit comments

Comments
 (0)