Skip to content

Support scala 3 #446

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
wants to merge 25 commits into from
Closed

Support scala 3 #446

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
344bb13
suport scala 3.0.0-RC1
russwyte Feb 26, 2021
ad63fe5
scalafm
russwyte Feb 26, 2021
5910767
override constructors where appropriate
russwyte Mar 2, 2021
5079836
scalafmt
russwyte Mar 2, 2021
d8abc03
update CI pipeline
russwyte Mar 2, 2021
4397c7b
update CI pipeline
russwyte Mar 2, 2021
bf33bf1
exclude 2.13.5 from 0.6.28 build
russwyte Mar 2, 2021
f561225
also need to exlude scala 3 from 0.6.28
russwyte Mar 2, 2021
0425741
fix conflicts
russwyte Mar 3, 2021
9606d60
update CI to inlude all supported versions
russwyte Mar 3, 2021
28eeb7d
don't use 2.13.5
russwyte Mar 3, 2021
3c0e714
remove jcenter
russwyte Mar 3, 2021
d15c21b
put back jcenter repo
russwyte Mar 3, 2021
7d70b3d
use include instead of exclude
russwyte Mar 3, 2021
ea04026
clean before package
russwyte Mar 3, 2021
b8c4311
need to quute
russwyte Mar 3, 2021
47cc047
clean before compiling example
russwyte Mar 3, 2021
fb8188a
update to Scala 3.0.0-RC2
russwyte Apr 1, 2021
d70eaa0
punt and use asInstanceOf to avoid breaking change
russwyte Apr 1, 2021
f594b66
fix ci.yml so that it has the correct scala 3 version
russwyte Apr 1, 2021
5176b44
scalafmt
russwyte Apr 1, 2021
f77e53a
scala 3.0.0 FTW
russwyte May 13, 2021
ed3ad20
get scaladocs for scala 3 working
russwyte Jun 3, 2021
0432c8f
scalafmt and bump scala 3 version
russwyte Jul 6, 2021
cf5e4e7
update scala to release version 3.0.1
russwyte Jul 9, 2021
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 .github/workflows/ci.yml
View file
Open in desktop
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.1-RC1"
- scalaversion: "3.0.1-RC2"
Copy link
Member

Choose a reason for hiding this comment

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

Why bump to a RC? let's first get this released for 3.0.0 😅

Copy link
Contributor Author

@russwyte russwyte Jul 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Already tried 3.0.0 (earlier) and it didn't work because of sbt and scaladoc/dottydoc borkage with scalajs. But if it can work now (maybe SBT fix?) - that's great! 👍

3.0.1-RC1 and on will work right now.

Copy link
Member

Choose a reason for hiding this comment

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

I see! Frustrating. Btw thanks for picking this up again!

PS if you make a tiny PR to this repo (e.g. fix a typo) maybe @sjrd can merge it quick and then you'll be whitelisted for CI.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't mind doing a PR like that, but what is strange is that until a few commits ago CI was working fine.

Copy link
Member

Choose a reason for hiding this comment

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

GH changed their policy recently, maybe while you were working on this. It makes contributing more difficult IMO.

scalajsversion: "1.x"
env:
SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}"
Expand Down
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"

ThisBuild / crossScalaVersions := {
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1", "3.0.1-RC1")
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1", "3.0.1-RC2")
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
}
ThisBuild / scalaVersion := crossScalaVersions.value.head
Expand Down
7 changes: 5 additions & 2 deletions src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import scala.scalajs.js.annotation._
import scala.scalajs.js.typedarray.{ArrayBuffer, ArrayBufferView}
import scala.scalajs.js.{undefined, |}
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 @@ -500,7 +502,8 @@ trait RTCDataChannelInit extends js.Object {
class RTCDataChannelEvent(typeArg: String,
init: js.UndefOr[RTCDataChannelEventInit])
extends Event(typeArg, init) {
def this(init: js.UndefOr[RTCDataChannelEventInit]) = this(typeArg = "datachannel", init = init)
def this(init: js.UndefOr[RTCDataChannelEventInit]) =
this(typeArg = "datachannel", init = init)

/**
* Contains the RTCDataChannel containing the data channel associated with
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/org/scalajs/dom/raw/lib.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3113,7 +3113,8 @@ class Touch extends js.Object {
*/
@js.native
@JSGlobal
class KeyboardEvent(typeArg: String, init: js.UndefOr[KeyboardEventInit] = js.native)
class KeyboardEvent(typeArg: String,
init: js.UndefOr[KeyboardEventInit] = js.native)
extends UIEvent(typeArg, init) with ModifierKeyEvent {

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