Skip to content

Commit f6fe76c

Browse files
committed
Upgrade to Scala.js 1.9.0
1 parent 8f99dad commit f6fe76c

File tree

4 files changed

+2
-41
lines changed

4 files changed

+2
-41
lines changed

compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -567,14 +567,7 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP
567567

568568
case Some(annot) if annot.symbol == jsdefn.JSGlobalAnnot =>
569569
checkJSGlobalLiteral(annot)
570-
val pathName = annot.argumentConstantString(0).getOrElse {
571-
if ((enclosingOwner is OwnerKind.ScalaMod) && !sym.owner.isPackageObject) {
572-
report.error(
573-
"Native JS members inside non-native objects must have an explicit name in @JSGlobal",
574-
annot.tree)
575-
}
576-
sym.defaultJSName
577-
}
570+
val pathName = annot.argumentConstantString(0).getOrElse(sym.defaultJSName)
578571
checkGlobalRefPath(pathName)
579572

580573
case Some(annot) if annot.symbol == jsdefn.JSImportAnnot =>

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

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

tests/neg-scalajs/native-load-spec-need-explicit-name.check

Lines changed: 0 additions & 8 deletions
This file was deleted.

tests/neg-scalajs/native-load-spec-need-explicit-name.scala

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)