Skip to content

Commit 2edaeea

Browse files
sjrdWojciechMazur
authored andcommitted
Upgrade to Scala.js 1.15.0.
1 parent 26920a4 commit 2edaeea

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

compiler/test/dotty/Properties.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ object Properties {
103103
/** scalajs-javalib jar */
104104
def scalaJSJavalib: String = sys.props("dotty.tests.classes.scalaJSJavalib")
105105

106+
/** scalajs-scalalib jar */
107+
def scalaJSScalalib: String = sys.props("dotty.tests.classes.scalaJSScalalib")
108+
106109
/** scalajs-library jar */
107110
def scalaJSLibrary: String = sys.props("dotty.tests.classes.scalaJSLibrary")
108111
}

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ object TestConfiguration {
5252

5353
lazy val scalaJSClasspath = mkClasspath(List(
5454
Properties.scalaJSJavalib,
55+
Properties.scalaJSScalalib,
5556
Properties.scalaJSLibrary,
5657
Properties.dottyLibraryJS
5758
))

project/Build.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,7 @@ object Build {
16491649
Seq(
16501650
"-Ddotty.tests.classes.dottyLibraryJS=" + dottyLibraryJSJar,
16511651
"-Ddotty.tests.classes.scalaJSJavalib=" + findArtifactPath(externalJSDeps, "scalajs-javalib"),
1652+
"-Ddotty.tests.classes.scalaJSScalalib=" + findArtifactPath(externalJSDeps, "scalajs-scalalib_2.13"),
16521653
"-Ddotty.tests.classes.scalaJSLibrary=" + findArtifactPath(externalJSDeps, "scalajs-library_2.13"),
16531654
)
16541655
},

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
libraryDependencySchemes +=
77
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
88

9-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
9+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
1010

1111
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
1212

0 commit comments

Comments
 (0)