Skip to content

Commit 7d65adf

Browse files
committed
chore: add non-bootstrapped core project
1 parent ce2a276 commit 7d65adf

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
val scala3 = Build.scala3
2+
val `scala3-nonbootstrapped` = Build.`scala3-nonbootstrapped`
23
val `scala3-bootstrapped` = Build.`scala3-bootstrapped`
34
val `scala3-interfaces` = Build.`scala3-interfaces`
45
val `scala3-compiler` = Build.`scala3-compiler`

project/Build.scala

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,26 @@ object Build {
13631363
)
13641364
)
13651365

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+
13661386
// ==============================================================================================
13671387
// =================================== SCALA STANDARD LIBRARY ===================================
13681388
// ==============================================================================================
@@ -1429,6 +1449,7 @@ object Build {
14291449
Test / compile := (`scala-library-nonbootstrapped` / Test / compile).value,
14301450
Test / doc := (`scala-library-nonbootstrapped` / Test / doc).value,
14311451
Test / run := (`scala-library-nonbootstrapped` / Test / run).evaluated,
1452+
Test / test := (`scala-library-nonbootstrapped` / Test / test).value,
14321453
// Packaging configuration of the stdlib
14331454
Compile / packageBin / publishArtifact := true,
14341455
Compile / packageDoc / publishArtifact := false,
@@ -1449,7 +1470,7 @@ object Build {
14491470
moduleName := "scala-library",
14501471
version := dottyVersion,
14511472
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
14531474
// (not the actual version we use to compile the project)
14541475
scalaVersion := referenceVersion,
14551476
crossPaths := false, // org.scala-lang:scala-library doesn't have a crosspath
@@ -1517,7 +1538,7 @@ object Build {
15171538
moduleName := "scala3-library",
15181539
version := dottyVersion,
15191540
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
15211542
// (not the actual version we use to compile the project)
15221543
scalaVersion := referenceVersion,
15231544
crossPaths := true, // org.scala-lang:scala3-library has a crosspath
@@ -1584,7 +1605,7 @@ object Build {
15841605
val lm = dependencyResolution.value
15851606
val log = streams.value.log
15861607
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" %
15881609
scalaVersion.value, scalaModuleInfo = None, retrieveDir, log)
15891610
.fold(w => throw w.resolveException, identity)
15901611
Defaults.makeScalaInstance(
@@ -1668,7 +1689,7 @@ object Build {
16681689
val lm = dependencyResolution.value
16691690
val log = streams.value.log
16701691
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" %
16721693
scalaVersion.value, scalaModuleInfo = None, retrieveDir, log)
16731694
.fold(w => throw w.resolveException, identity)
16741695
Defaults.makeScalaInstance(

0 commit comments

Comments
 (0)