Skip to content

Commit c1eb964

Browse files
committed
Upgrade to Scala.js 1.3.0.
1 parent 0525ba0 commit c1eb964

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

project/Build.scala

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ object Build {
10411041
++ (dir / "shared/src/test/require-jdk7" ** "*.scala").get
10421042

10431043
++ (dir / "js/src/test/scala" ** (("*.scala": FileFilter)
1044-
-- "ExportsTest.scala" // JS exports + do not compile because of a var in a structural type
1044+
-- "ExportsTest.scala" // JS exports + IR checking error
10451045
-- "ObjectTest.scala" // compile errors caused by #9588
10461046
-- "StackTraceTest.scala" // would require `npm install source-map-support`
10471047
-- "UnionTypeTest.scala" // requires the Scala 2 macro defined in Typechecking*.scala
@@ -1057,12 +1057,8 @@ object Build {
10571057
// Putting them here instead of above makes sure that we do not regress on compilation+linking.
10581058
Test / testOptions += Tests.Filter { name =>
10591059
!Set[String](
1060-
"org.scalajs.testsuite.compiler.InteroperabilityTest", // 3 tests require JS exports, all other tests pass
1061-
10621060
"org.scalajs.testsuite.jsinterop.AsyncTest", // needs JS exports in PromiseMock.scala
1063-
"org.scalajs.testsuite.jsinterop.DynamicTest", // one test requires JS exports, all other tests pass
10641061
"org.scalajs.testsuite.jsinterop.JSExportStaticTest", // JS exports
1065-
"org.scalajs.testsuite.jsinterop.NonNativeJSTypeTest", // 1 test fails because of a progression for value class fields (needs an update upstream)
10661062

10671063
// Not investigated so far
10681064
"org.scalajs.testsuite.junit.JUnitAbstractClassTestCheck",

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")
44

5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.2.0")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
66

77
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6")
88

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.2.0")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")

0 commit comments

Comments
 (0)