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
scala 3.0.0 FTW
  • Loading branch information
russwyte committed May 13, 2021
commit f77e53a95529001f35452270a520eaa9c0141ddb
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
include:
- scalaversion: "2.10.7"
scalajsversion: "0.6.x"
- scalaversion: "3.0.0-RC2"
- scalaversion: "3.0.0"
scalajsversion: "1.x"
env:
SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}"
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
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"

ThisBuild / crossScalaVersions := {
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1", "3.0.0-RC2")
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")
}
ThisBuild / scalaVersion := crossScalaVersions.value.head
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-RC2
sbt.version=1.5.1
11 changes: 4 additions & 7 deletions src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@ package org.scalajs.dom.experimental.webrtc

import scala.scalajs.js
import scala.scalajs.js.annotation._
import scala.scalajs.js.typedarray.{ArrayBufferView, ArrayBuffer}
import scala.scalajs.js.|

import scala.scalajs.js.typedarray.{ArrayBuffer, ArrayBufferView}
import scala.scalajs.js.{undefined, |}
Comment on lines -8 to +9
Copy link
Member

Choose a reason for hiding this comment

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

Spurious changes that should be reverted.

import org.scalajs.dom.Blob
import org.scalajs.dom.raw.{
DOMException, Event, EventInit, EventTarget, MessageEvent
}
import org.scalajs.dom.raw.{DOMException, Event, EventInit, EventTarget, MessageEvent}
import org.scalajs.dom.experimental.mediastream._

@js.native
Expand Down Expand Up @@ -503,7 +500,7 @@ trait RTCDataChannelInit extends js.Object {
class RTCDataChannelEvent(typeArg: String,
init: js.UndefOr[RTCDataChannelEventInit])
extends Event(typeArg, init) {
def this(init: RTCDataChannelEventInit) = this("datachannel", init)
def this(init: js.UndefOr[RTCDataChannelEventInit]) = this(typeArg = "datachannel", init = init)

/**
* Contains the RTCDataChannel containing the data channel associated with
Expand Down
8 changes: 3 additions & 5 deletions src/main/scala/org/scalajs/dom/raw/lib.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1561,11 +1561,9 @@ class MouseEvent(typeArg: String, init: js.UndefOr[MouseEventInit])
@js.native
@JSGlobal
class PointerEvent(typeArg: String,
pointerEventInit: js.UndefOr[PointerEventInit] = js.undefined)
pointerEventInit: js.UndefOr[PointerEventInit] = js.native)
extends MouseEvent(typeArg, pointerEventInit) {

def this(typeArg: String) = this(typeArg, js.native)

/**
* An identifier assigned to a pointer event that is unique from the identifiers
* of all active pointer events at the time. Authors cannot assume values convey
Expand Down Expand Up @@ -3115,10 +3113,10 @@ class Touch extends js.Object {
*/
@js.native
@JSGlobal
class KeyboardEvent(typeArg: String, init: js.UndefOr[KeyboardEventInit])
class KeyboardEvent(typeArg: String, init: js.UndefOr[KeyboardEventInit] = js.native)
extends UIEvent(typeArg, init) with ModifierKeyEvent {

def this(typeArg: String) = this(typeArg, js.native)
// def this(typeArg: String) = this(typeArg, js.native)

/**
* Returns the Unicode value of a character key pressed during a keypress event.
Expand Down