Skip to content

Commit 1ed50db

Browse files
committed
Upgrade to Scala.js 1.2.0.
And enable a number of tests that have been updated upstream to be compatible with dotty.
1 parent 221c25c commit 1ed50db

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

project/Build.scala

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,29 +1025,15 @@ object Build {
10251025
(dir / "shared/src/test/scala" ** (("*.scala": FileFilter)
10261026
-- "ReflectiveCallTest.scala" // uses many forms of structural calls that are not allowed in Scala 3 anymore
10271027
-- "EnumerationTest.scala" // scala.Enumeration support for Scala.js is not implemented in dotc (yet)
1028-
-- "SymbolTest.scala" // uses the old literal symbol syntax, pending update upstream
1029-
1030-
// all the following depend on HashSetTest and LinkedHashSetTest ...
1031-
-- "CollectionsOnCheckedCollectionTest.scala"
1032-
-- "CollectionsOnCheckedListTest.scala"
1033-
-- "CollectionsOnCheckedSetTest.scala"
1034-
-- "CollectionsOnSetsTest.scala"
1035-
-- "CollectionsOnSynchronizedCollectionTest.scala"
1036-
-- "CollectionsOnSynchronizedListTest.scala"
1037-
-- "CollectionsOnSynchronizedSetTest.scala"
1038-
1039-
// ... which do not compile because of an abstract method shadowing a concrete method, pending update upstream
1040-
-- "HashSetTest.scala"
1041-
-- "LinkedHashSetTest.scala"
10421028
)).get
10431029

10441030
++ (dir / "shared/src/test/require-sam" ** "*.scala").get
10451031
++ (dir / "shared/src/test/require-jdk8" ** "*.scala").get
10461032
++ (dir / "shared/src/test/require-jdk7" ** "*.scala").get
10471033

10481034
++ (dir / "js/src/test/scala/org/scalajs/testsuite/compiler" ** (("*.scala": FileFilter)
1049-
-- "InteroperabilityTest.scala" // various compile errors, pending update upstream
1050-
-- "OptimizerTest.scala" // compile errors: false + string and () + string, pending update upstream
1035+
-- "InteroperabilityTest.scala" // compiler crash, related to value classes in JS interop
1036+
-- "OptimizerTest.scala" // non-native JS classes
10511037
-- "ReflectionTest.scala" // tests fail (wrong load spec for JS globals)
10521038
-- "RegressionJSTest.scala" // non-native JS classes
10531039
-- "RuntimeTypesTest.scala" // compile errors: no ClassTag for Null and Nothing
@@ -1083,7 +1069,7 @@ object Build {
10831069
)).get
10841070

10851071
++ (dir / "js/src/test/scala/org/scalajs/testsuite/library" ** (("*.scala": FileFilter)
1086-
-- "BigIntTest.scala" // Ambiguous reference because of new non-shadowing rule in Scala 3, pending update upstream
1072+
-- "BigIntTest.scala" // non-native JS classes
10871073
-- "ObjectTest.scala" // compile errors caused by #9588
10881074
-- "StackTraceTest.scala" // would require `npm install source-map-support`
10891075
-- "UnionTypeTest.scala" // requires a Scala 2 macro

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.1.1")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.2.0")
66

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

0 commit comments

Comments
 (0)