Skip to content

Commit 19b3b1e

Browse files
committed
Upgrade to Scala.js 1.20.1.
In this commit, we ignore the new test for `linkTimeIf`.
1 parent e092688 commit 19b3b1e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

project/Build.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,6 +2820,7 @@ object Build {
28202820
++ (dir / "js/src/test/scala" ** (("*.scala": FileFilter)
28212821
-- "StackTraceTest.scala" // would require `npm install source-map-support`
28222822
-- "UnionTypeTest.scala" // requires the Scala 2 macro defined in Typechecking*.scala
2823+
-- "LinkTimeIfTest.scala" // TODO implement support for linkTimeIf
28232824
)).get
28242825

28252826
++ (dir / "js/src/test/require-2.12" ** "*.scala").get

project/ScalaLibraryPlugin.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import scala.jdk.CollectionConverters.*
66
import java.nio.file.Files
77
import xsbti.VirtualFileRef
88
import sbt.internal.inc.Stamper
9+
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport.scalaJSVersion
910

1011
object ScalaLibraryPlugin extends AutoPlugin {
1112

1213
override def trigger = noTrigger
1314

14-
private val scala2Version = "2.13.16"
15-
private val scalaJSVersion = "1.19.0"
15+
private val scala2Version = "2.13.16"
1616

1717
val fetchScala2ClassFiles = taskKey[(Set[File], File)]("Fetch the files to use that were compiled with Scala 2")
1818
val fetchScala2SJSIR = taskKey[(Set[File], File)]("Fetch the .sjsir to use from Scala 2")

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.19.0")
9+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
1010

1111
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
1212

0 commit comments

Comments
 (0)