From 56ce1a2407d9a923e07c066d7064947b68535c3c Mon Sep 17 00:00:00 2001 From: Olivier NOUGUIER Date: Sun, 23 Feb 2025 15:25:55 +0100 Subject: [PATCH 1/2] Update dependencies to Scala3 LTS --- project/Dependencies.scala | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9c549a088..9eca0e4f8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,8 +7,8 @@ object Dependencies { object Ver { val scala211 = "2.11.12" val scala212 = "2.12.15" - val scala213 = "2.13.6" - val scala3 = "3.1.3" + val scala213 = "2.13.16" + val scala3 = "3.3.5" } object Dep { diff --git a/project/build.properties b/project/build.properties index 04267b14a..73df629ac 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index a9ce080ea..e639c87ca 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,9 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0" libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") -addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") +addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.4.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") From a351fcc909ae4a1512b4995987e08f99e8cf248c Mon Sep 17 00:00:00 2001 From: Olivier NOUGUIER Date: Tue, 25 Feb 2025 13:24:53 +0100 Subject: [PATCH 2/2] Update Scala 2.12 version Remove 2.11 support --- api-reports/2_12.txt | 54 +++++++++---------- api-reports/2_13.txt | 54 +++++++++---------- .../scala-2/org/scalajs/dom/FrameType.scala | 2 +- .../scala-2/org/scalajs/dom/MIMEType.scala | 10 ++-- .../org/scalajs/dom/PermissionName.scala | 2 +- .../org/scalajs/dom/RTCBundlePolicy.scala | 4 +- .../org/scalajs/dom/RTCSignalingState.scala | 8 +-- .../org/scalajs/dom/RTCStatsType.scala | 4 +- .../org/scalajs/dom/ReferrerPolicy.scala | 10 ++-- .../org/scalajs/dom/RequestCache.scala | 8 +-- .../org/scalajs/dom/RequestCredentials.scala | 2 +- .../scala-2/org/scalajs/dom/RequestMode.scala | 4 +- project/Dependencies.scala | 3 +- project/Lib.scala | 2 - project/plugins.sbt | 2 +- 15 files changed, 83 insertions(+), 86 deletions(-) diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index 979356dbe..7a7b87278 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -2336,7 +2336,7 @@ FrameType[JT] FrameType[SO] val auxiliary: FrameType FrameType[SO] val nested: FrameType FrameType[SO] val none: FrameType -FrameType[SO] val `top-level` = "top-level".asInstanceOf[FrameType] +FrameType[SO] val `top-level`: FrameType FrozenArray[JT] @js.annotation.JSBracketAccess def apply(index: Int): T FrozenArray[JT] val length: Int FullscreenOptions[JT] var navigationUI: js.UndefOr[String] @@ -16301,11 +16301,11 @@ LockOptions[JT] var mode: js.UndefOr[LockMode] LockOptions[JT] var signal: js.UndefOr[AbortSignal] LockOptions[JT] var steal: js.UndefOr[Boolean] MIMEType[JT] -MIMEType[SO] val `application/xhtml+xml` = "application/xhtml+xml".asInstanceOf[MIMEType] -MIMEType[SO] val `application/xml` = "application/xml".asInstanceOf[MIMEType] -MIMEType[SO] val `image/svg+xml` = "image/svg+xml".asInstanceOf[MIMEType] -MIMEType[SO] val `text/html` = "text/html".asInstanceOf[MIMEType] -MIMEType[SO] val `text/xml` = "text/xml".asInstanceOf[MIMEType] +MIMEType[SO] val `application/xhtml+xml`: MIMEType +MIMEType[SO] val `application/xml`: MIMEType +MIMEType[SO] val `image/svg+xml`: MIMEType +MIMEType[SO] val `text/html`: MIMEType +MIMEType[SO] val `text/xml`: MIMEType MediaDeviceInfo[JT] val deviceId: String MediaDeviceInfo[JT] val groupId: String MediaDeviceInfo[JT] val kind: MediaDeviceKind @@ -17099,7 +17099,7 @@ PermissionName[JT] PermissionName[SO] val geolocation: PermissionName PermissionName[SO] val midi: PermissionName PermissionName[SO] val notifications: PermissionName -PermissionName[SO] val `persistent-storage` = "persistent-storage".asInstanceOf[PermissionName] +PermissionName[SO] val `persistent-storage`: PermissionName PermissionName[SO] val push: PermissionName PermissionState[JT] PermissionState[SO] val denied: PermissionState @@ -17318,8 +17318,8 @@ QueuingStrategy[JT] var highWaterMark: Int QueuingStrategy[JT] var size: js.Function1[T, Int] RTCBundlePolicy[JT] RTCBundlePolicy[SO] val balanced: RTCBundlePolicy -RTCBundlePolicy[SO] val `max-bundle` = "max-bundle".asInstanceOf[RTCBundlePolicy] -RTCBundlePolicy[SO] val `max-compat` = "max-compat".asInstanceOf[RTCBundlePolicy] +RTCBundlePolicy[SO] val `max-bundle`: RTCBundlePolicy +RTCBundlePolicy[SO] val `max-compat`: RTCBundlePolicy RTCConfiguration[JT] var bundlePolicy: js.UndefOr[RTCBundlePolicy] RTCConfiguration[JT] var iceServers: js.UndefOr[js.Array[RTCIceServer]] RTCConfiguration[JT] var iceTransportPolicy: js.UndefOr[RTCIceTransportPolicy] @@ -17492,18 +17492,18 @@ RTCSessionDescriptionInit[JT] var `type`: js.UndefOr[RTCSdpType] RTCSessionDescriptionInit[SO] def apply(`type`: js.UndefOr[RTCSdpType]?, sdp: js.UndefOr[String]?): RTCSessionDescriptionInit (@deprecated in 2.0.0) RTCSignalingState[JT] RTCSignalingState[SO] val closed: RTCSignalingState -RTCSignalingState[SO] val `have-local-offer` = "have-local-offer".asInstanceOf[RTCSignalingState] -RTCSignalingState[SO] val `have-local-pranswer` = "have-local-pranswer".asInstanceOf[RTCSignalingState] -RTCSignalingState[SO] val `have-remote-offer` = "have-remote-offer".asInstanceOf[RTCSignalingState] -RTCSignalingState[SO] val `have-remote-pranswer` = "have-remote-pranswer".asInstanceOf[RTCSignalingState] +RTCSignalingState[SO] val `have-local-offer`: RTCSignalingState +RTCSignalingState[SO] val `have-local-pranswer`: RTCSignalingState +RTCSignalingState[SO] val `have-remote-offer`: RTCSignalingState +RTCSignalingState[SO] val `have-remote-pranswer`: RTCSignalingState RTCSignalingState[SO] val stable: RTCSignalingState RTCStats[JT] val id: String RTCStats[JT] val timestamp: Double RTCStats[JT] val `type`: RTCStatsType RTCStatsReport[JT] def apply(id: String): RTCStats RTCStatsType[JT] -RTCStatsType[SO] val `inbound-rtp` = "inbound-rtp".asInstanceOf[RTCStatsType] -RTCStatsType[SO] val `outbound-rtp` = "outbound-rtp".asInstanceOf[RTCStatsType] +RTCStatsType[SO] val `inbound-rtp`: RTCStatsType +RTCStatsType[SO] val `outbound-rtp`: RTCStatsType RadioNodeList[JC] @JSBracketAccess def apply(index: Int): T RadioNodeList[JC] def item(index: Int): T RadioNodeList[JC] def length: Int @@ -17564,11 +17564,11 @@ ReadableStreamUnderlyingSource[JT] var start: js.UndefOr[js.Function1[ReadableSt ReadableStreamUnderlyingSource[JT] var `type`: js.UndefOr[ReadableStreamType] ReferrerPolicy[JT] ReferrerPolicy[SO] val empty: ReferrerPolicy -ReferrerPolicy[SO] val `no-referrer` = "no-referrer".asInstanceOf[ReferrerPolicy] -ReferrerPolicy[SO] val `no-referrer-when-downgrade` = "no-referrer-when-downgrade".asInstanceOf[ReferrerPolicy] -ReferrerPolicy[SO] val `origin-only` = "origin-only".asInstanceOf[ReferrerPolicy] -ReferrerPolicy[SO] val `origin-when-cross-origin` = "origin-when-cross-origin".asInstanceOf[ReferrerPolicy] -ReferrerPolicy[SO] val `unsafe-url` = "unsafe-url".asInstanceOf[ReferrerPolicy] +ReferrerPolicy[SO] val `no-referrer`: ReferrerPolicy +ReferrerPolicy[SO] val `no-referrer-when-downgrade`: ReferrerPolicy +ReferrerPolicy[SO] val `origin-only`: ReferrerPolicy +ReferrerPolicy[SO] val `origin-when-cross-origin`: ReferrerPolicy +ReferrerPolicy[SO] val `unsafe-url`: ReferrerPolicy Request[JC] def arrayBuffer(): js.Promise[ArrayBuffer] Request[JC] def blob(): js.Promise[Blob] Request[JC] def bodyUsed: Boolean @@ -17591,15 +17591,15 @@ Request[JC] def text(): js.Promise[String] Request[JC] def url: String RequestCache[JT] RequestCache[SO] val default: RequestCache -RequestCache[SO] val `force-cache` = "force-cache".asInstanceOf[RequestCache] -RequestCache[SO] val `no-cache` = "no-cache".asInstanceOf[RequestCache] -RequestCache[SO] val `no-store` = "no-store".asInstanceOf[RequestCache] -RequestCache[SO] val `only-if-cached` = "only-if-cached".asInstanceOf[RequestCache] +RequestCache[SO] val `force-cache`: RequestCache +RequestCache[SO] val `no-cache`: RequestCache +RequestCache[SO] val `no-store`: RequestCache +RequestCache[SO] val `only-if-cached`: RequestCache RequestCache[SO] val reload: RequestCache RequestCredentials[JT] RequestCredentials[SO] val include: RequestCredentials RequestCredentials[SO] val omit: RequestCredentials -RequestCredentials[SO] val `same-origin` = "same-origin".asInstanceOf[RequestCredentials] +RequestCredentials[SO] val `same-origin`: RequestCredentials RequestDestination[JT] RequestDestination[SO] val document: RequestDestination RequestDestination[SO] val empty: RequestDestination @@ -17626,8 +17626,8 @@ RequestInit[JT] var window: js.UndefOr[Null] RequestMode[JT] RequestMode[SO] val cors: RequestMode RequestMode[SO] val navigate: RequestMode -RequestMode[SO] val `no-cors` = "no-cors".asInstanceOf[RequestMode] -RequestMode[SO] val `same-origin` = "same-origin".asInstanceOf[RequestMode] +RequestMode[SO] val `no-cors`: RequestMode +RequestMode[SO] val `same-origin`: RequestMode RequestRedirect[JT] RequestRedirect[SO] val error: RequestRedirect RequestRedirect[SO] val follow: RequestRedirect diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index 979356dbe..7a7b87278 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -2336,7 +2336,7 @@ FrameType[JT] FrameType[SO] val auxiliary: FrameType FrameType[SO] val nested: FrameType FrameType[SO] val none: FrameType -FrameType[SO] val `top-level` = "top-level".asInstanceOf[FrameType] +FrameType[SO] val `top-level`: FrameType FrozenArray[JT] @js.annotation.JSBracketAccess def apply(index: Int): T FrozenArray[JT] val length: Int FullscreenOptions[JT] var navigationUI: js.UndefOr[String] @@ -16301,11 +16301,11 @@ LockOptions[JT] var mode: js.UndefOr[LockMode] LockOptions[JT] var signal: js.UndefOr[AbortSignal] LockOptions[JT] var steal: js.UndefOr[Boolean] MIMEType[JT] -MIMEType[SO] val `application/xhtml+xml` = "application/xhtml+xml".asInstanceOf[MIMEType] -MIMEType[SO] val `application/xml` = "application/xml".asInstanceOf[MIMEType] -MIMEType[SO] val `image/svg+xml` = "image/svg+xml".asInstanceOf[MIMEType] -MIMEType[SO] val `text/html` = "text/html".asInstanceOf[MIMEType] -MIMEType[SO] val `text/xml` = "text/xml".asInstanceOf[MIMEType] +MIMEType[SO] val `application/xhtml+xml`: MIMEType +MIMEType[SO] val `application/xml`: MIMEType +MIMEType[SO] val `image/svg+xml`: MIMEType +MIMEType[SO] val `text/html`: MIMEType +MIMEType[SO] val `text/xml`: MIMEType MediaDeviceInfo[JT] val deviceId: String MediaDeviceInfo[JT] val groupId: String MediaDeviceInfo[JT] val kind: MediaDeviceKind @@ -17099,7 +17099,7 @@ PermissionName[JT] PermissionName[SO] val geolocation: PermissionName PermissionName[SO] val midi: PermissionName PermissionName[SO] val notifications: PermissionName -PermissionName[SO] val `persistent-storage` = "persistent-storage".asInstanceOf[PermissionName] +PermissionName[SO] val `persistent-storage`: PermissionName PermissionName[SO] val push: PermissionName PermissionState[JT] PermissionState[SO] val denied: PermissionState @@ -17318,8 +17318,8 @@ QueuingStrategy[JT] var highWaterMark: Int QueuingStrategy[JT] var size: js.Function1[T, Int] RTCBundlePolicy[JT] RTCBundlePolicy[SO] val balanced: RTCBundlePolicy -RTCBundlePolicy[SO] val `max-bundle` = "max-bundle".asInstanceOf[RTCBundlePolicy] -RTCBundlePolicy[SO] val `max-compat` = "max-compat".asInstanceOf[RTCBundlePolicy] +RTCBundlePolicy[SO] val `max-bundle`: RTCBundlePolicy +RTCBundlePolicy[SO] val `max-compat`: RTCBundlePolicy RTCConfiguration[JT] var bundlePolicy: js.UndefOr[RTCBundlePolicy] RTCConfiguration[JT] var iceServers: js.UndefOr[js.Array[RTCIceServer]] RTCConfiguration[JT] var iceTransportPolicy: js.UndefOr[RTCIceTransportPolicy] @@ -17492,18 +17492,18 @@ RTCSessionDescriptionInit[JT] var `type`: js.UndefOr[RTCSdpType] RTCSessionDescriptionInit[SO] def apply(`type`: js.UndefOr[RTCSdpType]?, sdp: js.UndefOr[String]?): RTCSessionDescriptionInit (@deprecated in 2.0.0) RTCSignalingState[JT] RTCSignalingState[SO] val closed: RTCSignalingState -RTCSignalingState[SO] val `have-local-offer` = "have-local-offer".asInstanceOf[RTCSignalingState] -RTCSignalingState[SO] val `have-local-pranswer` = "have-local-pranswer".asInstanceOf[RTCSignalingState] -RTCSignalingState[SO] val `have-remote-offer` = "have-remote-offer".asInstanceOf[RTCSignalingState] -RTCSignalingState[SO] val `have-remote-pranswer` = "have-remote-pranswer".asInstanceOf[RTCSignalingState] +RTCSignalingState[SO] val `have-local-offer`: RTCSignalingState +RTCSignalingState[SO] val `have-local-pranswer`: RTCSignalingState +RTCSignalingState[SO] val `have-remote-offer`: RTCSignalingState +RTCSignalingState[SO] val `have-remote-pranswer`: RTCSignalingState RTCSignalingState[SO] val stable: RTCSignalingState RTCStats[JT] val id: String RTCStats[JT] val timestamp: Double RTCStats[JT] val `type`: RTCStatsType RTCStatsReport[JT] def apply(id: String): RTCStats RTCStatsType[JT] -RTCStatsType[SO] val `inbound-rtp` = "inbound-rtp".asInstanceOf[RTCStatsType] -RTCStatsType[SO] val `outbound-rtp` = "outbound-rtp".asInstanceOf[RTCStatsType] +RTCStatsType[SO] val `inbound-rtp`: RTCStatsType +RTCStatsType[SO] val `outbound-rtp`: RTCStatsType RadioNodeList[JC] @JSBracketAccess def apply(index: Int): T RadioNodeList[JC] def item(index: Int): T RadioNodeList[JC] def length: Int @@ -17564,11 +17564,11 @@ ReadableStreamUnderlyingSource[JT] var start: js.UndefOr[js.Function1[ReadableSt ReadableStreamUnderlyingSource[JT] var `type`: js.UndefOr[ReadableStreamType] ReferrerPolicy[JT] ReferrerPolicy[SO] val empty: ReferrerPolicy -ReferrerPolicy[SO] val `no-referrer` = "no-referrer".asInstanceOf[ReferrerPolicy] -ReferrerPolicy[SO] val `no-referrer-when-downgrade` = "no-referrer-when-downgrade".asInstanceOf[ReferrerPolicy] -ReferrerPolicy[SO] val `origin-only` = "origin-only".asInstanceOf[ReferrerPolicy] -ReferrerPolicy[SO] val `origin-when-cross-origin` = "origin-when-cross-origin".asInstanceOf[ReferrerPolicy] -ReferrerPolicy[SO] val `unsafe-url` = "unsafe-url".asInstanceOf[ReferrerPolicy] +ReferrerPolicy[SO] val `no-referrer`: ReferrerPolicy +ReferrerPolicy[SO] val `no-referrer-when-downgrade`: ReferrerPolicy +ReferrerPolicy[SO] val `origin-only`: ReferrerPolicy +ReferrerPolicy[SO] val `origin-when-cross-origin`: ReferrerPolicy +ReferrerPolicy[SO] val `unsafe-url`: ReferrerPolicy Request[JC] def arrayBuffer(): js.Promise[ArrayBuffer] Request[JC] def blob(): js.Promise[Blob] Request[JC] def bodyUsed: Boolean @@ -17591,15 +17591,15 @@ Request[JC] def text(): js.Promise[String] Request[JC] def url: String RequestCache[JT] RequestCache[SO] val default: RequestCache -RequestCache[SO] val `force-cache` = "force-cache".asInstanceOf[RequestCache] -RequestCache[SO] val `no-cache` = "no-cache".asInstanceOf[RequestCache] -RequestCache[SO] val `no-store` = "no-store".asInstanceOf[RequestCache] -RequestCache[SO] val `only-if-cached` = "only-if-cached".asInstanceOf[RequestCache] +RequestCache[SO] val `force-cache`: RequestCache +RequestCache[SO] val `no-cache`: RequestCache +RequestCache[SO] val `no-store`: RequestCache +RequestCache[SO] val `only-if-cached`: RequestCache RequestCache[SO] val reload: RequestCache RequestCredentials[JT] RequestCredentials[SO] val include: RequestCredentials RequestCredentials[SO] val omit: RequestCredentials -RequestCredentials[SO] val `same-origin` = "same-origin".asInstanceOf[RequestCredentials] +RequestCredentials[SO] val `same-origin`: RequestCredentials RequestDestination[JT] RequestDestination[SO] val document: RequestDestination RequestDestination[SO] val empty: RequestDestination @@ -17626,8 +17626,8 @@ RequestInit[JT] var window: js.UndefOr[Null] RequestMode[JT] RequestMode[SO] val cors: RequestMode RequestMode[SO] val navigate: RequestMode -RequestMode[SO] val `no-cors` = "no-cors".asInstanceOf[RequestMode] -RequestMode[SO] val `same-origin` = "same-origin".asInstanceOf[RequestMode] +RequestMode[SO] val `no-cors`: RequestMode +RequestMode[SO] val `same-origin`: RequestMode RequestRedirect[JT] RequestRedirect[SO] val error: RequestRedirect RequestRedirect[SO] val follow: RequestRedirect diff --git a/dom/src/main/scala-2/org/scalajs/dom/FrameType.scala b/dom/src/main/scala-2/org/scalajs/dom/FrameType.scala index ea78c2dcd..4abd01e36 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/FrameType.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/FrameType.scala @@ -15,7 +15,7 @@ object FrameType { val auxiliary: FrameType = "auxiliary".asInstanceOf[FrameType] /** The window client's global object's browsing context is a top-level browsing context. */ - val `top-level` = "top-level".asInstanceOf[FrameType] + val `top-level`: FrameType = "top-level".asInstanceOf[FrameType] /** The window client's global object's browsing context is a nested browsing context. */ val nested: FrameType = "nested".asInstanceOf[FrameType] diff --git a/dom/src/main/scala-2/org/scalajs/dom/MIMEType.scala b/dom/src/main/scala-2/org/scalajs/dom/MIMEType.scala index 32705d9c0..978da420a 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/MIMEType.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/MIMEType.scala @@ -6,11 +6,11 @@ import scala.scalajs.js sealed trait MIMEType extends js.Any object MIMEType { - val `text/html` = "text/html".asInstanceOf[MIMEType] - val `text/xml` = "text/xml".asInstanceOf[MIMEType] - val `application/xml` = "application/xml".asInstanceOf[MIMEType] + val `text/html`: MIMEType = "text/html".asInstanceOf[MIMEType] + val `text/xml`: MIMEType = "text/xml".asInstanceOf[MIMEType] + val `application/xml`: MIMEType = "application/xml".asInstanceOf[MIMEType] - val `application/xhtml+xml` = + val `application/xhtml+xml`: MIMEType = "application/xhtml+xml".asInstanceOf[MIMEType] - val `image/svg+xml` = "image/svg+xml".asInstanceOf[MIMEType] + val `image/svg+xml`: MIMEType = "image/svg+xml".asInstanceOf[MIMEType] } diff --git a/dom/src/main/scala-2/org/scalajs/dom/PermissionName.scala b/dom/src/main/scala-2/org/scalajs/dom/PermissionName.scala index 48afc9e84..02d8d9bc8 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/PermissionName.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/PermissionName.scala @@ -11,6 +11,6 @@ object PermissionName { val notifications: PermissionName = "notifications".asInstanceOf[PermissionName] val push: PermissionName = "push".asInstanceOf[PermissionName] - val `persistent-storage` = + val `persistent-storage`: PermissionName = "persistent-storage".asInstanceOf[PermissionName] } diff --git a/dom/src/main/scala-2/org/scalajs/dom/RTCBundlePolicy.scala b/dom/src/main/scala-2/org/scalajs/dom/RTCBundlePolicy.scala index c7610f85e..a90e1a616 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/RTCBundlePolicy.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/RTCBundlePolicy.scala @@ -16,10 +16,10 @@ object RTCBundlePolicy { /** Gather ICE candidates for each track. If the remote endpoint is not BUNDLE-aware, negotiate all media tracks on * separate transports. */ - val `max-compat` = "max-compat".asInstanceOf[RTCBundlePolicy] + val `max-compat`: RTCBundlePolicy = "max-compat".asInstanceOf[RTCBundlePolicy] /** Gather ICE candidates for only one track. If the remote endpoint is not BUNDLE-aware, negotiate only one media * track. */ - val `max-bundle` = "max-bundle".asInstanceOf[RTCBundlePolicy] + val `max-bundle`: RTCBundlePolicy = "max-bundle".asInstanceOf[RTCBundlePolicy] } diff --git a/dom/src/main/scala-2/org/scalajs/dom/RTCSignalingState.scala b/dom/src/main/scala-2/org/scalajs/dom/RTCSignalingState.scala index b9840c121..45e9db86a 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/RTCSignalingState.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/RTCSignalingState.scala @@ -13,21 +13,21 @@ object RTCSignalingState { val stable: RTCSignalingState = "stable".asInstanceOf[RTCSignalingState] /** A local description, of type "offer", has been successfully applied. */ - val `have-local-offer` = "have-local-offer".asInstanceOf[RTCSignalingState] + val `have-local-offer`: RTCSignalingState = "have-local-offer".asInstanceOf[RTCSignalingState] /** A remote description, of type "offer", has been successfully applied. */ - val `have-remote-offer` = "have-remote-offer".asInstanceOf[RTCSignalingState] + val `have-remote-offer`: RTCSignalingState = "have-remote-offer".asInstanceOf[RTCSignalingState] /** A remote description of type "offer" has been successfully applied and a local description of type "pranswer" has * been successfully applied. */ - val `have-local-pranswer` = + val `have-local-pranswer`: RTCSignalingState = "have-local-pranswer".asInstanceOf[RTCSignalingState] /** A local description of type "offer" has been successfully applied and a remote description of type "pranswer" has * been successfully applied. */ - val `have-remote-pranswer` = + val `have-remote-pranswer`: RTCSignalingState = "have-remote-pranswer".asInstanceOf[RTCSignalingState] /** The connection is closed. */ diff --git a/dom/src/main/scala-2/org/scalajs/dom/RTCStatsType.scala b/dom/src/main/scala-2/org/scalajs/dom/RTCStatsType.scala index 90986cc2d..98e26c3d9 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/RTCStatsType.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/RTCStatsType.scala @@ -9,8 +9,8 @@ sealed trait RTCStatsType extends js.Any object RTCStatsType { /** Inbound RTP. */ - val `inbound-rtp` = "inbound-rtp".asInstanceOf[RTCStatsType] + val `inbound-rtp`: RTCStatsType = "inbound-rtp".asInstanceOf[RTCStatsType] /** Outbound RTP. */ - val `outbound-rtp` = "outbound-rtp".asInstanceOf[RTCStatsType] + val `outbound-rtp`: RTCStatsType = "outbound-rtp".asInstanceOf[RTCStatsType] } diff --git a/dom/src/main/scala-2/org/scalajs/dom/ReferrerPolicy.scala b/dom/src/main/scala-2/org/scalajs/dom/ReferrerPolicy.scala index 730f90754..74b8b55e9 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/ReferrerPolicy.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/ReferrerPolicy.scala @@ -7,13 +7,13 @@ sealed trait ReferrerPolicy extends js.Any object ReferrerPolicy { val empty: ReferrerPolicy = "".asInstanceOf[ReferrerPolicy] - val `no-referrer` = "no-referrer".asInstanceOf[ReferrerPolicy] + val `no-referrer`: ReferrerPolicy = "no-referrer".asInstanceOf[ReferrerPolicy] - val `no-referrer-when-downgrade` = + val `no-referrer-when-downgrade`: ReferrerPolicy = "no-referrer-when-downgrade".asInstanceOf[ReferrerPolicy] - val `origin-only` = "origin-only".asInstanceOf[ReferrerPolicy] + val `origin-only`: ReferrerPolicy = "origin-only".asInstanceOf[ReferrerPolicy] - val `origin-when-cross-origin` = + val `origin-when-cross-origin`: ReferrerPolicy = "origin-when-cross-origin".asInstanceOf[ReferrerPolicy] - val `unsafe-url` = "unsafe-url".asInstanceOf[ReferrerPolicy] + val `unsafe-url`: ReferrerPolicy = "unsafe-url".asInstanceOf[ReferrerPolicy] } diff --git a/dom/src/main/scala-2/org/scalajs/dom/RequestCache.scala b/dom/src/main/scala-2/org/scalajs/dom/RequestCache.scala index 34f7e9342..b3b39b585 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/RequestCache.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/RequestCache.scala @@ -8,9 +8,9 @@ sealed trait RequestCache extends js.Any object RequestCache { val default: RequestCache = "default".asInstanceOf[RequestCache] - val `no-store` = "no-store".asInstanceOf[RequestCache] + val `no-store`: RequestCache = "no-store".asInstanceOf[RequestCache] val reload: RequestCache = "reload".asInstanceOf[RequestCache] - val `no-cache` = "no-cache".asInstanceOf[RequestCache] - val `force-cache` = "force-cache".asInstanceOf[RequestCache] - val `only-if-cached` = "only-if-cached".asInstanceOf[RequestCache] + val `no-cache`: RequestCache = "no-cache".asInstanceOf[RequestCache] + val `force-cache`: RequestCache = "force-cache".asInstanceOf[RequestCache] + val `only-if-cached`: RequestCache = "only-if-cached".asInstanceOf[RequestCache] } diff --git a/dom/src/main/scala-2/org/scalajs/dom/RequestCredentials.scala b/dom/src/main/scala-2/org/scalajs/dom/RequestCredentials.scala index bd4b40924..92e9d4c30 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/RequestCredentials.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/RequestCredentials.scala @@ -8,6 +8,6 @@ sealed trait RequestCredentials extends js.Any object RequestCredentials { val omit: RequestCredentials = "omit".asInstanceOf[RequestCredentials] - val `same-origin` = "same-origin".asInstanceOf[RequestCredentials] + val `same-origin`: RequestCredentials = "same-origin".asInstanceOf[RequestCredentials] val include: RequestCredentials = "include".asInstanceOf[RequestCredentials] } diff --git a/dom/src/main/scala-2/org/scalajs/dom/RequestMode.scala b/dom/src/main/scala-2/org/scalajs/dom/RequestMode.scala index b0d5a8153..5b79a5367 100644 --- a/dom/src/main/scala-2/org/scalajs/dom/RequestMode.scala +++ b/dom/src/main/scala-2/org/scalajs/dom/RequestMode.scala @@ -8,7 +8,7 @@ sealed trait RequestMode extends js.Any object RequestMode { val navigate: RequestMode = "navigate".asInstanceOf[RequestMode] - val `same-origin` = "same-origin".asInstanceOf[RequestMode] - val `no-cors` = "no-cors".asInstanceOf[RequestMode] + val `same-origin`: RequestMode = "same-origin".asInstanceOf[RequestMode] + val `no-cors`: RequestMode = "no-cors".asInstanceOf[RequestMode] val cors: RequestMode = "cors".asInstanceOf[RequestMode] } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9eca0e4f8..d2912c156 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,8 +5,7 @@ import scalafix.sbt.BuildInfo.scalafixVersion object Dependencies { object Ver { - val scala211 = "2.11.12" - val scala212 = "2.12.15" + val scala212 = "2.12.20" val scala213 = "2.13.16" val scala3 = "3.3.5" } diff --git a/project/Lib.scala b/project/Lib.scala index e2f796097..fc66d4196 100644 --- a/project/Lib.scala +++ b/project/Lib.scala @@ -18,7 +18,6 @@ object Lib { "-Xfatal-warnings", )), scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { - case Some((2, 11)) => "-Ywarn-unused-import" :: Nil case Some((2, 12)) => "-Ywarn-unused:imports,patvars,locals,implicits" :: Nil case Some((2, 13)) => "-Wunused:imports,patvars,locals,implicits" :: Nil case _ => Nil @@ -29,7 +28,6 @@ object Lib { def crossScala: Project => Project = _ .settings( crossScalaVersions := Seq( - Ver.scala211, Ver.scala212, Ver.scala213, Ver.scala3, diff --git a/project/plugins.sbt b/project/plugins.sbt index e639c87ca..6f15a00dd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,6 +4,6 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") -addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.4.1") +addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")