Support scala 3

.github/workflows/ci.yml

@@ -12,11 +12,16 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- scalaversion: ["2.11.12", "2.12.10", "2.13.1"]
+ scalaversion: ["2.11.12", "2.12.10", "2.13.1", "2.13.5", "3.0.0-RC1"]
  scalajsversion: ["1.x", "0.6.x"]
  include:
  - scalaversion: "2.10.7"
  scalajsversion: "0.6.x"
+ Exclude:
+ - scalaversion: "2.13.5"
+ scalajsversion: "0.6.x"
+ - scalaversion: "3.0.0-RC1"
+ scalajsversion: "0.6.x"
  env:
  SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}"
  steps:

build.sbt

@@ -6,12 +6,13 @@ lazy val root = project.in(file(".")).
 name := "Scala.js DOM"
 
 crossScalaVersions in ThisBuild := {
- if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1")
+ if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.5", "3.0.0-RC1")
  else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
 }
 scalaVersion in ThisBuild := crossScalaVersions.value.head
 
 val commonSettings = Seq(
+ resolvers += Resolver.JCenterRepository,
  version := "1.2.0-SNAPSHOT",
  organization := "org.scala-js",
  scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.5.0-M2

project/build.sbt

@@ -1,5 +1,5 @@
 val scalaJSVersion =
- Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("1.0.0")
+ Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("1.5.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 

src/main/scala/org/scalajs/dom/crypto/Crypto.scala

@@ -930,10 +930,8 @@ object KeyFormat {
 trait RSAPublicKey extends js.Object {
 
  /* modulus, as a base64 URL encoded String */
- @js.native
  def n: String = js.native
 
  /* exponent, as a base64 URL encoded String */
- @js.native
  def e: String = js.native
 }

src/main/scala/org/scalajs/dom/experimental/URL.scala

@@ -11,7 +11,8 @@ import scala.scalajs.js.annotation._
  */
 @js.native
 @JSGlobal
-class URL(url: String, base: String = js.native) extends js.Object {
+class URL(url: String, base: String) extends js.Object {
+ def this(url: String) = this(url, js.native)
 
  /**
  * Returns a DOMString containing the origin of the URL, that is its scheme,

src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorker.scala

@@ -30,8 +30,9 @@ import org.scalajs.dom.webworkers
  */
 @js.native
 @JSGlobal
-class SharedWorker(stringUrl: String, name: js.UndefOr[String] = js.native)
+class SharedWorker(stringUrl: String, name: js.UndefOr[String])
  extends webworkers.AbstractWorker {
+ def this(stringUrl: String) = this(stringUrl, js.native)
 
  /**
  * The port property of the SharedWorker interface returns a [[MessagePort]]

src/main/scala/org/scalajs/dom/ext/package.scala

@@ -1,8 +1,8 @@
 package org.scalajs.dom
 
 import scala.language.implicitConversions
-
 import scala.collection.mutable
+import scala.runtime.RichDouble
 
 package object ext {
 
@@ -22,17 +22,18 @@ package object ext {
  def cast[T] = x.asInstanceOf[T]
  }
 
- implicit def pimpAnimatedNumber(x: svg.AnimatedNumber) = x.baseVal
+ implicit def pimpAnimatedNumber(x: svg.AnimatedNumber): Double = x.baseVal
 
- implicit def pimpRichAnimatedNumber(x: svg.AnimatedNumber) =
+ implicit def pimpRichAnimatedNumber(x: svg.AnimatedNumber): RichDouble =
  x.baseVal: runtime.RichDouble
 
- implicit def pimpAnimatedLength(x: svg.AnimatedLength) = x.baseVal.value
+ implicit def pimpAnimatedLength(x: svg.AnimatedLength): Double =
+ x.baseVal.value
 
- implicit def pimpRichAnimatedLength(x: svg.AnimatedLength) =
+ implicit def pimpRichAnimatedLength(x: svg.AnimatedLength): RichDouble =
  x.baseVal.value: runtime.RichDouble
 
- implicit def color2String(c: Color) = c.toString
+ implicit def color2String(c: Color): String = c.toString
  implicit class pimpedContext(val ctx: CanvasRenderingContext2D) {
  def prepCircle(x: Double, y: Double, r: Double) = {
  ctx.beginPath()