Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update to Scala 3.0.0-RC2
  • Loading branch information
russwyte committed Apr 1, 2021
commit fb8188a988ab4d6b05c584ef23c349c873ae6686
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ 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", "3.0.0-RC1")
ThisBuild / crossScalaVersions := {
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1", "3.0.0-RC2")
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
}
scalaVersion in ThisBuild := crossScalaVersions.value.head
ThisBuild / scalaVersion := crossScalaVersions.value.head

val commonSettings = Seq(
resolvers += Resolver.JCenterRepository,
Expand Down Expand Up @@ -105,7 +105,7 @@ lazy val readme = ScalatexReadme(
).settings(
scalaVersion := "2.12.10",
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
(resources in Compile) += (fullOptJS in (example, Compile)).value.data
(Compile / resources) += (example / Compile / fullOptJS).value.data,
Comment on lines -107 to +108
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When rebasing, can you isolate those changes of build syntax in a first commit, together with the upgrade of sbt, please?

)

lazy val example = project.
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.0-M2
sbt.version=1.5.0-RC2
3 changes: 1 addition & 2 deletions src/main/scala/org/scalajs/dom/experimental/URL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import scala.scalajs.js.annotation._
*/
@js.native
@JSGlobal
class URL(url: String, base: String) extends js.Object {
def this(url: String) = this(url, js.native)
class URL(url: String, base: String = js.native) extends js.Object {

/**
* Returns a DOMString containing the origin of the URL, that is its scheme,
Expand Down
84 changes: 36 additions & 48 deletions src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
package org.scalajs.dom.experimental.intl

import scala.scalajs.js
import scala.scalajs.js.|
import scala.scalajs.js.annotation._
import scala.scalajs.js.{UndefOr, |}

/**
* The Intl.Collator object is a constructor for collators, objects that enable language
Expand Down Expand Up @@ -63,7 +63,6 @@ class NumberFormat(
options: js.Any): js.Array[String] = js.native
}

@js.native
trait CollatorOptions extends js.Object {
val localeMatcher: js.UndefOr[String]
val usage: js.UndefOr[String]
Expand Down Expand Up @@ -120,21 +119,16 @@ object CollatorOptions {
ignorePunctuation: js.UndefOr[Boolean] = js.undefined,
numeric: js.UndefOr[Boolean] = js.undefined,
caseFirst: js.UndefOr[String] = js.undefined
): CollatorOptions = {
js.Dynamic
.literal(
localeMatcher = localeMatcher,
usage = usage,
sensitivity = sensitivity,
ignorePunctuation = ignorePunctuation,
numeric = numeric,
caseFirst = caseFirst
)
.asInstanceOf[CollatorOptions]
): CollatorOptions = new CollatorOptions {
override val localeMatcher: UndefOr[String] = localeMatcher
override val usage: UndefOr[String] = usage
override val sensitivity: UndefOr[String] = sensitivity
override val ignorePunctuation: UndefOr[Boolean] = ignorePunctuation
override val numeric: UndefOr[Boolean] = numeric
override val caseFirst: UndefOr[String] = caseFirst
}
}

@js.native
trait DateTimeFormatOptions extends js.Object {
val localeMatcher: js.UndefOr[String]
val timeZone: js.UndefOr[String]
Expand Down Expand Up @@ -197,29 +191,25 @@ object DateTimeFormatOptions {
second: js.UndefOr[String] = js.undefined,
timeZoneName: js.UndefOr[String] = js.undefined
): DateTimeFormatOptions = {
// format: off
js.Dynamic
.literal(
localeMatcher = localeMatcher,
timeZone = timeZone,
hour12 = hour12,
formatMatcher = formatMatcher,
weekday = weekday,
era = era,
year = year,
month = month,
day = day,
hour = hour,
minute = minute,
second = second,
timeZoneName = timeZoneName
)
.asInstanceOf[DateTimeFormatOptions]
new DateTimeFormatOptions {
override val localeMatcher: UndefOr[String] = localeMatcher
override val timeZone: UndefOr[String] = timeZone
override val hour12: UndefOr[Boolean] = hour12
override val formatMatcher: UndefOr[String] = formatMatcher
override val weekday: UndefOr[String] = weekday
override val era: UndefOr[String] = era
override val year: UndefOr[String] = year
override val month: UndefOr[String] = month
override val day: UndefOr[String] = day
override val hour: UndefOr[String] = hour
override val minute: UndefOr[String] = minute
override val second: UndefOr[String] = second
override val timeZoneName: UndefOr[String] = timeZoneName
}
// format: on
}
}

@js.native
trait NumberFormatOptions extends js.Object {
val localeMatcher: js.UndefOr[String]
val style: js.UndefOr[String]
Expand Down Expand Up @@ -297,20 +287,18 @@ object NumberFormatOptions {
maximumFractionDigits: js.UndefOr[Double] = js.undefined,
minimumSignificantDigits: js.UndefOr[Double] = js.undefined,
maximumSignificantDigits: js.UndefOr[Double] = js.undefined
): NumberFormatOptions = {
js.Dynamic
.literal(
localeMatcher = localeMatcher,
style = style,
currency = currency,
currencyDisplay = currencyDisplay,
useGrouping = useGrouping,
minimumIntegerDigits = minimumIntegerDigits,
minimumFractionDigits = minimumFractionDigits,
maximumFractionDigits = maximumFractionDigits,
minimumSignificantDigits = minimumSignificantDigits,
maximumSignificantDigits = maximumSignificantDigits
)
.asInstanceOf[NumberFormatOptions]
): NumberFormatOptions = new NumberFormatOptions {
override val localeMatcher: UndefOr[String] = localeMatcher
override val style: UndefOr[String] = style
override val currency: UndefOr[String] = currency
override val currencyDisplay: UndefOr[String] = currencyDisplay
override val useGrouping: UndefOr[Boolean] = useGrouping
override val minimumIntegerDigits: UndefOr[Double] = minimumIntegerDigits
override val minimumFractionDigits: UndefOr[Double] = minimumFractionDigits
override val maximumFractionDigits: UndefOr[Double] = maximumFractionDigits
override val minimumSignificantDigits: UndefOr[Double] =
minimumSignificantDigits
override val maximumSignificantDigits: UndefOr[Double] =
maximumSignificantDigits
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ import org.scalajs.dom.webworkers
*/
@js.native
@JSGlobal
class SharedWorker(stringUrl: String, name: js.UndefOr[String])
class SharedWorker(stringUrl: String, name: js.UndefOr[String] = js.native)
extends webworkers.AbstractWorker {
def this(stringUrl: String) = this(stringUrl, js.native)

/**
* The port property of the SharedWorker interface returns a [[MessagePort]]
* object used to communicate and control the shared worker.
Expand Down