Skip to content

Commit 187c1fe

Browse files
committed
Rename boostrapped library project
1 parent 3647e95 commit 187c1fe

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797

9898
- name: Test
9999
run: |
100-
./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-dotty/scripted scala2-compat/* ;configureIDE ;scala3-scala2-library/test:run ;scala3-scala2-library-tasty-tests/test"
100+
./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-dotty/scripted scala2-compat/* ;configureIDE ;scala3-stdlib-booststrapped/test:run ;scala3-stdlib-booststrapped-tasty-tests/test"
101101
./project/scripts/bootstrapCmdTests
102102
103103
## Only run bootstrapped tests for Windows since that's a superset of the

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
1010
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
1111
val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
1212
val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`
13-
val `scala3-scala2-library` = Build.`scala3-scala2-library`
14-
val `scala3-scala2-library-tasty-tests` = Build.`scala3-scala2-library-tasty-tests`
13+
val `scala3-stdlib-booststrapped` = Build.`scala3-stdlib-booststrapped`
14+
val `scala3-stdlib-booststrapped-tasty-tests` = Build.`scala3-stdlib-booststrapped-tasty-tests`
1515
val `scala3-staging` = Build.`scala3-staging`
1616
val `scala3-tasty-inspector` = Build.`scala3-tasty-inspector`
1717
val `scala3-language-server` = Build.`scala3-language-server`

project/Build.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ object Build {
806806
)
807807

808808
/** Scala library compiled by dotty using the latest published sources of the library */
809-
lazy val `scala3-scala2-library` = project.in(file("scala3-scala2-library")).
809+
lazy val `scala3-stdlib-booststrapped` = project.in(file("scala3-stdlib-booststrapped")).
810810
withCommonSettings(Bootstrapped).
811811
dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
812812
dependsOn(`scala3-tasty-inspector` % "test->test").
@@ -855,22 +855,22 @@ object Build {
855855
},
856856
)
857857

858-
/** Test the tasty generated by `scala3-scala2-library`
858+
/** Test the tasty generated by `scala3-stdlib-booststrapped`
859859
*
860860
* The tests are run with the bootstrapped compiler and the tasty inpector on the classpath.
861-
* The classpath has the default `scala-library` and not `scala3-scala2-library`.
861+
* The classpath has the default `scala-library` and not `scala3-stdlib-booststrapped`.
862862
*
863-
* The jar of `scala3-scala2-library` is provided for to the tests.
863+
* The jar of `scala3-stdlib-booststrapped` is provided for to the tests.
864864
* - inspector: test that we can load the contents of the jar using the tasty inspector
865865
* - from-tasty: test that we can recompile the contents of the jar using `dotc -from-tasty`
866866
*/
867-
lazy val `scala3-scala2-library-tasty-tests` = project.in(file("scala3-scala2-library-tasty-tests")).
867+
lazy val `scala3-stdlib-booststrapped-tasty-tests` = project.in(file("scala3-stdlib-booststrapped-tasty-tests")).
868868
withCommonSettings(Bootstrapped).
869869
dependsOn(`scala3-tasty-inspector` % "test->test").
870870
settings(commonBootstrappedSettings).
871871
settings(
872872
javaOptions := (javaOptions in `scala3-compiler-bootstrapped`).value,
873-
javaOptions += "-Ddotty.scala.library=" + packageBin.in(`scala3-scala2-library`, Compile).value.getAbsolutePath
873+
javaOptions += "-Ddotty.scala.library=" + packageBin.in(`scala3-stdlib-booststrapped`, Compile).value.getAbsolutePath
874874
)
875875

876876
lazy val `scala3-sbt-bridge` = project.in(file("sbt-bridge/src")).

scala3-scala2-library-tasty-tests/test/Scala3Scala2LibraryTASYyTest.scala renamed to scala3-stdlib-booststrapped-tasty-tests/test/BootstrappedStdLibTASYyTest.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import scala.quoted._
1111

1212
import java.io.File.pathSeparator
1313

14-
class Scala3Scala2LibraryTASYyTest:
14+
class BootstrappedStdLibTASYyTest:
1515

16-
import Scala3Scala2LibraryTASYyTest._
16+
import BootstrappedStdLibTASYyTest._
1717

1818
/** Test that we can load trees from TASTy */
1919
@Test def testTastyInspector: Unit =
@@ -41,7 +41,7 @@ class Scala3Scala2LibraryTASYyTest:
4141
val intersection = loadBlacklisted & compileBlacklisted
4242
assert(intersection.isEmpty,
4343
intersection.mkString(
44-
"`compileBlacklist` contains names that are already in `compileBlacklist`: \n ", "\n ", "\n\n"))
44+
"`compileBlacklist` contains names that are already in `loadBlacklist`: \n ", "\n ", "\n\n"))
4545

4646
@Test def blacklistsOnlyContainsClassesThatExist =
4747
val scalaLibJarTastyClassNamesSet = scalaLibJarTastyClassNames.toSet
@@ -88,9 +88,9 @@ class Scala3Scala2LibraryTASYyTest:
8888
assert(shouldBeWhitelisted.isEmpty,
8989
shouldBeWhitelisted.mkString("Some classes do not need to be blacklisted in `compileBlacklisted`\n ", "\n ", "\n\n"))
9090

91-
end Scala3Scala2LibraryTASYyTest
91+
end BootstrappedStdLibTASYyTest
9292

93-
object Scala3Scala2LibraryTASYyTest:
93+
object BootstrappedStdLibTASYyTest:
9494

9595
val scalaLibJarPath = System.getProperty("dotty.scala.library")
9696

@@ -203,4 +203,4 @@ object Scala3Scala2LibraryTASYyTest:
203203
/** Set of classes that cannot be recompilied from TASTy */
204204
def compileBlacklisted = compileBlacklist.toSet
205205

206-
end Scala3Scala2LibraryTASYyTest
206+
end BootstrappedStdLibTASYyTest

0 commit comments

Comments
 (0)