From 0e3c3c6d2a342d05cae35bfda78f5e59f908e928 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 1 Jul 2021 04:33:59 +0000 Subject: [PATCH] Cross-build for Scala 3 --- build.sbt | 2 +- project/build.properties | 2 +- project/build.sbt | 2 +- src/main/scala/org/scalajs/dom/ext/package.scala | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 371ebc4c8..e1debc58d 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ 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.1", "3.0.0") else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1") } scalaVersion in ThisBuild := crossScalaVersions.value.head diff --git a/project/build.properties b/project/build.properties index c0bab0494..9edb75b77 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.5.4 diff --git a/project/build.sbt b/project/build.sbt index bc96d108b..fa0d20902 100644 --- a/project/build.sbt +++ b/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.6.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) diff --git a/src/main/scala/org/scalajs/dom/ext/package.scala b/src/main/scala/org/scalajs/dom/ext/package.scala index 90e848b21..7f25a3430 100644 --- a/src/main/scala/org/scalajs/dom/ext/package.scala +++ b/src/main/scala/org/scalajs/dom/ext/package.scala @@ -22,17 +22,17 @@ 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): runtime.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): runtime.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()