@@ -1363,6 +1363,26 @@ object Build {
1363
1363
)
1364
1364
)
1365
1365
1366
+ // ==============================================================================================
1367
+ // ================================= NON-BOOTSTRAPPED PROJECTS ==================================
1368
+ // ==============================================================================================
1369
+
1370
+ lazy val `scala3-nonbootstrapped` = project
1371
+ .aggregate(`scala3-interfaces`, `scala3-library-nonbootstrapped` , `scala-library-nonbootstrapped`,
1372
+ `tasty-core-nonbootstrapped`, `scala3-compiler-nonbootstrapped`)
1373
+ .settings(
1374
+ name := " scala3-nonbootstrapped" ,
1375
+ moduleName := " scala3-nonbootstrapped" ,
1376
+ version := dottyNonBootstrappedVersion,
1377
+ // Nothing to be published by this project, it is only an aggregate
1378
+ Compile / publishArtifact := false ,
1379
+ Test / publishArtifact := false ,
1380
+ // Nothing to be published by this project
1381
+ publish / skip := true ,
1382
+ // Project specific target folder. sbt doesn't like having two projects using the same target folder
1383
+ target := target.value / " scala3-nonbootstrapped" ,
1384
+ )
1385
+
1366
1386
// ==============================================================================================
1367
1387
// =================================== SCALA STANDARD LIBRARY ===================================
1368
1388
// ==============================================================================================
@@ -1429,6 +1449,7 @@ object Build {
1429
1449
Test / compile := (`scala-library-nonbootstrapped` / Test / compile).value,
1430
1450
Test / doc := (`scala-library-nonbootstrapped` / Test / doc).value,
1431
1451
Test / run := (`scala-library-nonbootstrapped` / Test / run).evaluated,
1452
+ Test / test := (`scala-library-nonbootstrapped` / Test / test).value,
1432
1453
// Packaging configuration of the stdlib
1433
1454
Compile / packageBin / publishArtifact := true ,
1434
1455
Compile / packageDoc / publishArtifact := false ,
@@ -1449,7 +1470,7 @@ object Build {
1449
1470
moduleName := " scala-library" ,
1450
1471
version := dottyVersion,
1451
1472
versionScheme := Some (" semver-spec" ),
1452
- // sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
1473
+ // sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
1453
1474
// (not the actual version we use to compile the project)
1454
1475
scalaVersion := referenceVersion,
1455
1476
crossPaths := false , // org.scala-lang:scala-library doesn't have a crosspath
@@ -1517,7 +1538,7 @@ object Build {
1517
1538
moduleName := " scala3-library" ,
1518
1539
version := dottyVersion,
1519
1540
versionScheme := Some (" semver-spec" ),
1520
- // sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
1541
+ // sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
1521
1542
// (not the actual version we use to compile the project)
1522
1543
scalaVersion := referenceVersion,
1523
1544
crossPaths := true , // org.scala-lang:scala3-library has a crosspath
@@ -1584,7 +1605,7 @@ object Build {
1584
1605
val lm = dependencyResolution.value
1585
1606
val log = streams.value.log
1586
1607
val retrieveDir = streams.value.cacheDirectory / " scala3-compiler" / scalaVersion.value
1587
- val comp = lm.retrieve(" org.scala-lang" % " scala3-compiler_3" %
1608
+ val comp = lm.retrieve(" org.scala-lang" % " scala3-compiler_3" %
1588
1609
scalaVersion.value, scalaModuleInfo = None , retrieveDir, log)
1589
1610
.fold(w => throw w.resolveException, identity)
1590
1611
Defaults .makeScalaInstance(
@@ -1668,7 +1689,7 @@ object Build {
1668
1689
val lm = dependencyResolution.value
1669
1690
val log = streams.value.log
1670
1691
val retrieveDir = streams.value.cacheDirectory / " scala3-compiler" / scalaVersion.value
1671
- val comp = lm.retrieve(" org.scala-lang" % " scala3-compiler_3" %
1692
+ val comp = lm.retrieve(" org.scala-lang" % " scala3-compiler_3" %
1672
1693
scalaVersion.value, scalaModuleInfo = None , retrieveDir, log)
1673
1694
.fold(w => throw w.resolveException, identity)
1674
1695
Defaults .makeScalaInstance(
0 commit comments