Skip to content

Commit fee5f14

Browse files
committed
chore: generate library-internal-tasty for scaladoc
1 parent defd122 commit fee5f14

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-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: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,14 @@ 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"),
1157+
(Compile / sources) := (`scala-library-internal` / Compile / sources).value.filterNot(_.getPath.endsWith("scala/AnyVal.scala")),
1158+
)
1159+
11521160
def dottyLibrary(implicit mode: Mode): Project = mode match {
11531161
case NonBootstrapped => `scala3-library`
11541162
case Bootstrapped => `scala3-library-bootstrapped`
@@ -1232,6 +1240,7 @@ object Build {
12321240
settings(moduleName := "scala2-library")
12331241
.settings(
12341242
(Compile / packageBin / mappings) ++= (`scala-library-internal` / Compile / packageBin / mappings).value,
1243+
(Compile / packageBin / mappings) ++= (`scala-library-internal-tasty` / Compile / packageBin / mappings).value,
12351244
mimaCurrentClassfiles := (Compile / packageBin).value,
12361245
)
12371246

@@ -2620,9 +2629,11 @@ object ScaladocConfigs {
26202629
def defaultSourceLinks(version: String = dottyNonBootstrappedVersion, refVersion: String = dottyVersion) = Def.task {
26212630
def stdLibVersion = stdlibVersion(NonBootstrapped)
26222631
def srcManaged(v: String, s: String) = s"out/bootstrap/scala2-library-bootstrapped/scala-$v/src_managed/main/$s-library-src"
2632+
def srcManaged2 = s"library-internal/src"
26232633
SourceLinks(
26242634
List(
26252635
scalaSrcLink(stdLibVersion, srcManaged(version, "scala") + "="),
2636+
scalaSrcLink(stdLibVersion, srcManaged2 + "="),
26262637
dottySrcLink(refVersion, "library/src=", "#library/src"),
26272638
dottySrcLink(refVersion),
26282639
"docs=github://scala/scala3/main#docs"
@@ -2709,6 +2720,7 @@ object ScaladocConfigs {
27092720
lazy val Scala3 = Def.task {
27102721
val dottyJars: Seq[java.io.File] = Seq(
27112722
(`scala2-library-bootstrapped`/Compile/products).value,
2723+
(`scala-library-internal-tasty`/Compile/products).value,
27122724
(`scala3-library-bootstrapped`/Compile/products).value,
27132725
(`scala3-interfaces`/Compile/products).value,
27142726
(`tasty-core-bootstrapped`/Compile/products).value,
@@ -2775,6 +2787,7 @@ object ScaladocConfigs {
27752787
.withTargets(
27762788
Seq(
27772789
s"out/bootstrap/scala2-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
2790+
s"out/bootstrap/scala-library-internal-tasty/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
27782791
s"out/bootstrap/scala3-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
27792792
s"tmp/interfaces/target/classes",
27802793
s"out/bootstrap/tasty-core-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes"

0 commit comments

Comments
 (0)