Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit f471818

Browse files
authored
Merge pull request #327 from exoego/update
Reflect recent updates on Node.js v12.19.0
2 parents 436e32c + 2d4da62 commit f471818

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jdk:
1010

1111
env:
1212
matrix:
13-
- TRAVIS_NODE_VERSION="14.10.0"
14-
- TRAVIS_NODE_VERSION="12.18.3"
15-
- TRAVIS_NODE_VERSION="10.22.0"
13+
- TRAVIS_NODE_VERSION="14.14.0"
14+
- TRAVIS_NODE_VERSION="12.19.0"
15+
- TRAVIS_NODE_VERSION="10.22.1"
1616

1717
script:
1818
- sbt ++$TRAVIS_SCALA_VERSION test

app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,13 @@ trait Crypto extends js.Object {
310310
js.native
311311
def randomFill[T <: scala.scalajs.js.typedarray.TypedArray[_, T]](buffer: T, callback: Callback1[T]): T = js.native
312312

313-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
313+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
314314
def randomInt(max: Int): Int = js.native
315-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
315+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
316316
def randomInt(max: Int, callback: Callback1[Int]): Unit = js.native
317-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
317+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
318318
def randomInt(min: Int, max: Int): Int = js.native
319-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
319+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
320320
def randomInt(min: Int, max: Int, callback: Callback1[Int]): Unit = js.native
321321

322322
def scrypt(password: String, salt: String, keylen: Int, options: ScryptOptions, callback: Callback1[Buffer]): Unit =

app/nodejs-v14/src/main/scala/io/scalajs/nodejs/process/Process.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ trait Process extends IEventEmitter {
340340
* Returns the old mask if mask argument is given, otherwise returns the current mask.
341341
* @example process.umask([mask])
342342
*/
343+
@deprecated("DEP0139: Use umask(mask) instead.", "Node.js v12.19.0")
343344
def umask(): Int = js.native
344345

345346
/** Number of seconds Node.js has been running.

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ lazy val core = (project in file("./core"))
2525
libraryDependencies ++= Dependencies.core.value
2626
)
2727

28-
lazy val nodejs_v14 = createNodeVersionSpecificProject("14.10.0")
29-
lazy val nodejs_v12 = createNodeVersionSpecificProject("12.18.3")
30-
lazy val nodejs_v10 = createNodeVersionSpecificProject("10.22.0")
28+
lazy val nodejs_v14 = createNodeVersionSpecificProject("14.14.0")
29+
lazy val nodejs_v12 = createNodeVersionSpecificProject("12.19.0")
30+
lazy val nodejs_v10 = createNodeVersionSpecificProject("10.22.1")
3131

3232
def createNodeVersionSpecificProject(nodeFullVersion: String) = {
3333
val majorVersion = nodeFullVersion.split("\\.")(0)

0 commit comments

Comments
 (0)