Skip to content

Commit 2a7e8c2

Browse files
committed
chore: add library-internal-tasty
1 parent df93319 commit 2a7e8c2

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
66
val `scala3-library` = Build.`scala3-library`
77
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
88
val `scala-library-internal` = Build.`scala-library-internal`
9+
val `scala-library-internal-tasty` = Build.`scala-library-internal-tasty`
910
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
1011
val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
1112
val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`

project/Build.scala

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,15 @@ object Build {
11491149
scalaVersion := "2.13.16"
11501150
)
11511151

1152+
lazy val `scala-library-internal-tasty` = project.in(file("library-internal-tasty"))
1153+
.withCommonSettings(Bootstrapped)
1154+
.dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test")
1155+
.settings(
1156+
scalacOptions := Seq("-Werror:false", "-Ycompile-scala2-library"),
1157+
(Compile / sources) := (`scala-library-internal` / Compile / sources).value.filterNot(_.getPath.endsWith("AnyVal.scala")),
1158+
(Compile / packageBin / mappings) := (Compile / packageBin / mappings).value.filter(_._2.endsWith(".tasty"))
1159+
)
1160+
11521161
def dottyLibrary(implicit mode: Mode): Project = mode match {
11531162
case NonBootstrapped => `scala3-library`
11541163
case Bootstrapped => `scala3-library-bootstrapped`
@@ -1232,6 +1241,7 @@ object Build {
12321241
settings(moduleName := "scala2-library")
12331242
.settings(
12341243
(Compile / packageBin / mappings) ++= (`scala-library-internal` / Compile / packageBin / mappings).value,
1244+
(Compile / packageBin / mappings) ++= (`scala-library-internal-tasty` / Compile / packageBin / mappings).value,
12351245
mimaCurrentClassfiles := (Compile / packageBin).value,
12361246
)
12371247

@@ -2618,9 +2628,11 @@ object ScaladocConfigs {
26182628
def defaultSourceLinks(version: String = dottyNonBootstrappedVersion, refVersion: String = dottyVersion) = Def.task {
26192629
def stdLibVersion = stdlibVersion(NonBootstrapped)
26202630
def srcManaged(v: String, s: String) = s"out/bootstrap/scala2-library-bootstrapped/scala-$v/src_managed/main/$s-library-src"
2631+
def srcManaged2 = s"library-internal/src"
26212632
SourceLinks(
26222633
List(
26232634
scalaSrcLink(stdLibVersion, srcManaged(version, "scala") + "="),
2635+
scalaSrcLink(stdLibVersion, srcManaged2 + "="),
26242636
dottySrcLink(refVersion, "library/src=", "#library/src"),
26252637
dottySrcLink(refVersion),
26262638
"docs=github://scala/scala3/main#docs"
@@ -2707,6 +2719,7 @@ object ScaladocConfigs {
27072719
lazy val Scala3 = Def.task {
27082720
val dottyJars: Seq[java.io.File] = Seq(
27092721
(`scala2-library-bootstrapped`/Compile/products).value,
2722+
(`scala-library-internal-tasty`/Compile/products).value,
27102723
(`scala3-library-bootstrapped`/Compile/products).value,
27112724
(`scala3-interfaces`/Compile/products).value,
27122725
(`tasty-core-bootstrapped`/Compile/products).value,
@@ -2773,6 +2786,7 @@ object ScaladocConfigs {
27732786
.withTargets(
27742787
Seq(
27752788
s"out/bootstrap/scala2-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
2789+
s"out/bootstrap/scala-library-internal-tasty/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
27762790
s"out/bootstrap/scala3-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
27772791
s"tmp/interfaces/target/classes",
27782792
s"out/bootstrap/tasty-core-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes"

0 commit comments

Comments
 (0)