Skip to content

Cross-build for Scala 3 #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
armanbilge wants to merge 1 commit into from
Closed

Cross-build for Scala 3 #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.5.4
2 changes: 1 addition & 1 deletion project/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
10 changes: 5 additions & 5 deletions src/main/scala/org/scalajs/dom/ext/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down