Skip to content

Commit 1ba37b0

Browse files
hamzaremmalWojciechMazur
authored andcommitted
remove old scala3 library for Scala.js
[Cherry-picked 3cafb39]
1 parent c40fb36 commit 1ba37b0

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
@@ -2852,52 +2852,6 @@ object Build {
28522852
case Bootstrapped => `scala3-library-bootstrapped`
28532853
}
28542854

2855-
/** The dotty standard library compiled with the Scala.js back-end, to produce
2856-
* the corresponding .sjsir files.
2857-
*
2858-
* This artifact must be on the classpath on every "Dotty.js" project.
2859-
*
2860-
* Currently, only a very small fraction of the dotty library is actually
2861-
* included in this project, and hence available to Dotty.js projects. More
2862-
* will be added in the future as things are confirmed to be supported.
2863-
*/
2864-
lazy val `scala3-library-bootstrappedJS`: Project = project.in(file("library-js")).
2865-
asDottyLibrary(Bootstrapped).
2866-
enablePlugins(DottyJSPlugin).
2867-
settings(
2868-
commonBootstrappedSettings,
2869-
libraryDependencies +=
2870-
("org.scala-js" %% "scalajs-library" % scalaJSVersion).cross(CrossVersion.for3Use2_13),
2871-
// NOTE: Until 3.8.0, we pin the source files to be used by the scala3 library
2872-
Compile / sources := (`scala3-library-bootstrapped` / Compile / sources).value,
2873-
Compile / sources ++= Seq(
2874-
file(s"${baseDirectory.value}/src/scala/scalajs/js/internal/UnitOps.scala"),
2875-
file(s"${baseDirectory.value}/src/scala/scalajs/runtime/AnonFunctionXXL.scala"),
2876-
),
2877-
// NOTE: We keep this so that the mappings are correct when packaging
2878-
Compile / unmanagedSourceDirectories ++=
2879-
(`scala3-library-bootstrapped` / Compile / unmanagedSourceDirectories).value,
2880-
2881-
// Configure the source maps to point to GitHub for releases
2882-
scalacOptions ++= {
2883-
if (isRelease) {
2884-
val baseURI = (LocalRootProject / baseDirectory).value.toURI
2885-
val dottyVersion = version.value
2886-
Seq(s"-scalajs-mapSourceURI:$baseURI->$dottyGithubRawUserContentUrl/$dottyVersion/")
2887-
} else {
2888-
Nil
2889-
}
2890-
},
2891-
2892-
// Make sure `scala3-bootstrapped/test` doesn't fail on this project for no reason
2893-
Test / test := {},
2894-
Test / testOnly := {},
2895-
)
2896-
2897-
lazy val tastyCoreSettings = Seq(
2898-
scalacOptions += "-source:3.0-migration"
2899-
)
2900-
29012855
def tastyCore(implicit mode: Mode): Project = mode match {
29022856
case NonBootstrapped => `tasty-core-nonbootstrapped`
29032857
case Bootstrapped => `tasty-core-bootstrapped-new`
@@ -3389,7 +3343,7 @@ object Build {
33893343
*/
33903344
lazy val `scaladoc-js-common` = project.in(file("scaladoc-js/common")).
33913345
enablePlugins(DottyJSPlugin).
3392-
dependsOn(`scala3-library-bootstrappedJS`).
3346+
dependsOn(`scala3-library-sjs`).
33933347
settings(
33943348
commonBootstrappedSettings,
33953349
libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "2.8.0"))
@@ -3895,8 +3849,7 @@ object Build {
38953849
// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
38963850
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
38973851
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore).
3898-
bootstrappedAggregate(`scala3-language-server`,
3899-
`scala3-library-bootstrappedJS`, scaladoc, `scala3-presentation-compiler`).
3852+
bootstrappedAggregate(`scala3-language-server`, scaladoc, `scala3-presentation-compiler`).
39003853
dependsOn(tastyCore).
39013854
dependsOn(dottyCompiler).
39023855
dependsOn(dottyLibrary).

0 commit comments

Comments
 (0)