From 8dbb919806a2db77da9b49e80eed9b60084947b3 Mon Sep 17 00:00:00 2001 From: TATSUNO Yasuhiro Date: Tue, 9 Nov 2021 16:10:55 +0900 Subject: [PATCH 1/2] Bump Scala --- .github/workflows/ci.yaml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d116dbdb..56153c1f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,7 +6,7 @@ jobs: strategy: fail-fast: false matrix: - scala: [2.13.5, 2.12.13] + scala: [2.13.7, 2.12.15] nodejs: [16.3.0, 14.16.0, 12.21.0, 10.24.0] steps: - uses: actions/checkout@v2.4.0 diff --git a/build.sbt b/build.sbt index 7df98e38..9e5aff8f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -lazy val scala213 = "2.13.6" +lazy val scala213 = "2.13.7" lazy val scala212 = "2.12.15" ThisBuild / organization := "net.exoego" ThisBuild / crossScalaVersions := Seq(scala213, scala212) From 7fc7afd1d74c7ab0cc6b1381e7c66d18d60553c8 Mon Sep 17 00:00:00 2001 From: TATSUNO Yasuhiro Date: Tue, 9 Nov 2021 16:11:08 +0900 Subject: [PATCH 2/2] export is now a reserved keyword for Scala 3 --- .../src/main/scala/io/scalajs/nodejs/crypto/KeyObject.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/crypto/KeyObject.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/crypto/KeyObject.scala index e1c81fad..6f1fff2c 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/crypto/KeyObject.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/crypto/KeyObject.scala @@ -10,8 +10,8 @@ import scala.scalajs.js.| @js.native // TODO: Can be exposed as newable class when Node.js v10 dropped sealed trait KeyObject extends js.Object { - def export(options: KeyObjectExportOptions): Buffer | String = js.native - def export(): Buffer = js.native + def `export`(options: KeyObjectExportOptions): Buffer | String = js.native + def `export`(): Buffer = js.native /** For asymmetric keys, this property represents the type of the key. This property is undefined for unrecognized * KeyObject types and symmetric keys.