Skip to content

Commit 3cafb39

Browse files
committed
remove old scala3 library for Scala.js
1 parent a4760bb commit 3cafb39

File tree

2 files changed

+2
-50
lines changed

2 files changed

+2
-50
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ val `scala-library-bootstrapped` = Build.`scala-library-bootstrapped`
1515
val `scala3-library-bootstrapped-new` = Build.`scala3-library-bootstrapped-new`
1616
val `scala3-library` = Build.`scala3-library`
1717
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
18-
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
1918
val `scala3-sbt-bridge-bootstrapped` = Build.`scala3-sbt-bridge-bootstrapped`
2019
val `scala3-sbt-bridge-nonbootstrapped` = Build.`scala3-sbt-bridge-nonbootstrapped`
2120
val `scala3-staging-new` = Build.`scala3-staging-new`

project/Build.scala

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2792,52 +2792,6 @@ object Build {
27922792
case Bootstrapped => `scala3-library-bootstrapped`
27932793
}
27942794

2795-
/** The dotty standard library compiled with the Scala.js back-end, to produce
2796-
* the corresponding .sjsir files.
2797-
*
2798-
* This artifact must be on the classpath on every "Dotty.js" project.
2799-
*
2800-
* Currently, only a very small fraction of the dotty library is actually
2801-
* included in this project, and hence available to Dotty.js projects. More
2802-
* will be added in the future as things are confirmed to be supported.
2803-
*/
2804-
lazy val `scala3-library-bootstrappedJS`: Project = project.in(file("library-js")).
2805-
asDottyLibrary(Bootstrapped).
2806-
enablePlugins(DottyJSPlugin).
2807-
settings(
2808-
commonBootstrappedSettings,
2809-
libraryDependencies +=
2810-
("org.scala-js" %% "scalajs-library" % scalaJSVersion).cross(CrossVersion.for3Use2_13),
2811-
// NOTE: Until 3.8.0, we pin the source files to be used by the scala3 library
2812-
Compile / sources := (`scala3-library-bootstrapped` / Compile / sources).value,
2813-
Compile / sources ++= Seq(
2814-
file(s"${baseDirectory.value}/src/scala/scalajs/js/internal/UnitOps.scala"),
2815-
file(s"${baseDirectory.value}/src/scala/scalajs/runtime/AnonFunctionXXL.scala"),
2816-
),
2817-
// NOTE: We keep this so that the mappings are correct when packaging
2818-
Compile / unmanagedSourceDirectories ++=
2819-
(`scala3-library-bootstrapped` / Compile / unmanagedSourceDirectories).value,
2820-
2821-
// Configure the source maps to point to GitHub for releases
2822-
scalacOptions ++= {
2823-
if (isRelease) {
2824-
val baseURI = (LocalRootProject / baseDirectory).value.toURI
2825-
val dottyVersion = version.value
2826-
Seq(s"-scalajs-mapSourceURI:$baseURI->$dottyGithubRawUserContentUrl/$dottyVersion/")
2827-
} else {
2828-
Nil
2829-
}
2830-
},
2831-
2832-
// Make sure `scala3-bootstrapped/test` doesn't fail on this project for no reason
2833-
Test / test := {},
2834-
Test / testOnly := {},
2835-
)
2836-
2837-
lazy val tastyCoreSettings = Seq(
2838-
scalacOptions += "-source:3.0-migration"
2839-
)
2840-
28412795
def tastyCore(implicit mode: Mode): Project = mode match {
28422796
case NonBootstrapped => `tasty-core-nonbootstrapped`
28432797
case Bootstrapped => `tasty-core-bootstrapped-new`
@@ -3329,7 +3283,7 @@ object Build {
33293283
*/
33303284
lazy val `scaladoc-js-common` = project.in(file("scaladoc-js/common")).
33313285
enablePlugins(DottyJSPlugin).
3332-
dependsOn(`scala3-library-bootstrappedJS`).
3286+
dependsOn(`scala3-library-sjs`).
33333287
settings(
33343288
commonBootstrappedSettings,
33353289
libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "2.8.0"))
@@ -3835,8 +3789,7 @@ object Build {
38353789
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
38363790
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
38373791
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
3838-
bootstrappedAggregate(`scala3-language-server`,
3839-
`scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
3792+
bootstrappedAggregate(`scala3-language-server`, scaladoc, `scala3-presentation-compiler`).
38403793
dependsOn(tastyCore).
38413794
dependsOn(dottyCompiler).
38423795
dependsOn(dottyLibrary).

0 commit comments

Comments
 (0)