Skip to content

Commit fb8188a

Browse files
committed
update to Scala 3.0.0-RC2
1 parent 47cc047 commit fb8188a

File tree

5 files changed

+43
-58
lines changed

5 files changed

+43
-58
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ lazy val root = project.in(file(".")).
55

66
name := "Scala.js DOM"
77

8-
crossScalaVersions in ThisBuild := {
9-
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1", "3.0.0-RC1")
8+
ThisBuild / crossScalaVersions := {
9+
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1", "3.0.0-RC2")
1010
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
1111
}
12-
scalaVersion in ThisBuild := crossScalaVersions.value.head
12+
ThisBuild / scalaVersion := crossScalaVersions.value.head
1313

1414
val commonSettings = Seq(
1515
resolvers += Resolver.JCenterRepository,
@@ -105,7 +105,7 @@ lazy val readme = ScalatexReadme(
105105
).settings(
106106
scalaVersion := "2.12.10",
107107
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
108-
(resources in Compile) += (fullOptJS in (example, Compile)).value.data
108+
(Compile / resources) += (example / Compile / fullOptJS).value.data,
109109
)
110110

111111
lazy val example = project.

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.0-M2
1+
sbt.version=1.5.0-RC2

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import scala.scalajs.js.annotation._
1111
*/
1212
@js.native
1313
@JSGlobal
14-
class URL(url: String, base: String) extends js.Object {
15-
def this(url: String) = this(url, js.native)
14+
class URL(url: String, base: String = js.native) extends js.Object {
1615

1716
/**
1817
* Returns a DOMString containing the origin of the URL, that is its scheme,

src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala

Lines changed: 36 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
package org.scalajs.dom.experimental.intl
88

99
import scala.scalajs.js
10-
import scala.scalajs.js.|
1110
import scala.scalajs.js.annotation._
11+
import scala.scalajs.js.{UndefOr, |}
1212

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

66-
@js.native
6766
trait CollatorOptions extends js.Object {
6867
val localeMatcher: js.UndefOr[String]
6968
val usage: js.UndefOr[String]
@@ -120,21 +119,16 @@ object CollatorOptions {
120119
ignorePunctuation: js.UndefOr[Boolean] = js.undefined,
121120
numeric: js.UndefOr[Boolean] = js.undefined,
122121
caseFirst: js.UndefOr[String] = js.undefined
123-
): CollatorOptions = {
124-
js.Dynamic
125-
.literal(
126-
localeMatcher = localeMatcher,
127-
usage = usage,
128-
sensitivity = sensitivity,
129-
ignorePunctuation = ignorePunctuation,
130-
numeric = numeric,
131-
caseFirst = caseFirst
132-
)
133-
.asInstanceOf[CollatorOptions]
122+
): CollatorOptions = new CollatorOptions {
123+
override val localeMatcher: UndefOr[String] = localeMatcher
124+
override val usage: UndefOr[String] = usage
125+
override val sensitivity: UndefOr[String] = sensitivity
126+
override val ignorePunctuation: UndefOr[Boolean] = ignorePunctuation
127+
override val numeric: UndefOr[Boolean] = numeric
128+
override val caseFirst: UndefOr[String] = caseFirst
134129
}
135130
}
136131

137-
@js.native
138132
trait DateTimeFormatOptions extends js.Object {
139133
val localeMatcher: js.UndefOr[String]
140134
val timeZone: js.UndefOr[String]
@@ -197,29 +191,25 @@ object DateTimeFormatOptions {
197191
second: js.UndefOr[String] = js.undefined,
198192
timeZoneName: js.UndefOr[String] = js.undefined
199193
): DateTimeFormatOptions = {
200-
// format: off
201-
js.Dynamic
202-
.literal(
203-
localeMatcher = localeMatcher,
204-
timeZone = timeZone,
205-
hour12 = hour12,
206-
formatMatcher = formatMatcher,
207-
weekday = weekday,
208-
era = era,
209-
year = year,
210-
month = month,
211-
day = day,
212-
hour = hour,
213-
minute = minute,
214-
second = second,
215-
timeZoneName = timeZoneName
216-
)
217-
.asInstanceOf[DateTimeFormatOptions]
194+
new DateTimeFormatOptions {
195+
override val localeMatcher: UndefOr[String] = localeMatcher
196+
override val timeZone: UndefOr[String] = timeZone
197+
override val hour12: UndefOr[Boolean] = hour12
198+
override val formatMatcher: UndefOr[String] = formatMatcher
199+
override val weekday: UndefOr[String] = weekday
200+
override val era: UndefOr[String] = era
201+
override val year: UndefOr[String] = year
202+
override val month: UndefOr[String] = month
203+
override val day: UndefOr[String] = day
204+
override val hour: UndefOr[String] = hour
205+
override val minute: UndefOr[String] = minute
206+
override val second: UndefOr[String] = second
207+
override val timeZoneName: UndefOr[String] = timeZoneName
208+
}
218209
// format: on
219210
}
220211
}
221212

222-
@js.native
223213
trait NumberFormatOptions extends js.Object {
224214
val localeMatcher: js.UndefOr[String]
225215
val style: js.UndefOr[String]
@@ -297,20 +287,18 @@ object NumberFormatOptions {
297287
maximumFractionDigits: js.UndefOr[Double] = js.undefined,
298288
minimumSignificantDigits: js.UndefOr[Double] = js.undefined,
299289
maximumSignificantDigits: js.UndefOr[Double] = js.undefined
300-
): NumberFormatOptions = {
301-
js.Dynamic
302-
.literal(
303-
localeMatcher = localeMatcher,
304-
style = style,
305-
currency = currency,
306-
currencyDisplay = currencyDisplay,
307-
useGrouping = useGrouping,
308-
minimumIntegerDigits = minimumIntegerDigits,
309-
minimumFractionDigits = minimumFractionDigits,
310-
maximumFractionDigits = maximumFractionDigits,
311-
minimumSignificantDigits = minimumSignificantDigits,
312-
maximumSignificantDigits = maximumSignificantDigits
313-
)
314-
.asInstanceOf[NumberFormatOptions]
290+
): NumberFormatOptions = new NumberFormatOptions {
291+
override val localeMatcher: UndefOr[String] = localeMatcher
292+
override val style: UndefOr[String] = style
293+
override val currency: UndefOr[String] = currency
294+
override val currencyDisplay: UndefOr[String] = currencyDisplay
295+
override val useGrouping: UndefOr[Boolean] = useGrouping
296+
override val minimumIntegerDigits: UndefOr[Double] = minimumIntegerDigits
297+
override val minimumFractionDigits: UndefOr[Double] = minimumFractionDigits
298+
override val maximumFractionDigits: UndefOr[Double] = maximumFractionDigits
299+
override val minimumSignificantDigits: UndefOr[Double] =
300+
minimumSignificantDigits
301+
override val maximumSignificantDigits: UndefOr[Double] =
302+
maximumSignificantDigits
315303
}
316304
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ import org.scalajs.dom.webworkers
3030
*/
3131
@js.native
3232
@JSGlobal
33-
class SharedWorker(stringUrl: String, name: js.UndefOr[String])
33+
class SharedWorker(stringUrl: String, name: js.UndefOr[String] = js.native)
3434
extends webworkers.AbstractWorker {
35-
def this(stringUrl: String) = this(stringUrl, js.native)
36-
3735
/**
3836
* The port property of the SharedWorker interface returns a [[MessagePort]]
3937
* object used to communicate and control the shared worker.

0 commit comments

Comments
 (0)