diff --git a/.node-version b/.node-version index 2b9e31b9e..29e134fe6 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v14.7.0 +v14.10.0 diff --git a/.travis.yml b/.travis.yml index 217dcb167..8980cc0c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ jdk: env: matrix: - - TRAVIS_NODE_VERSION="14.7.0" + - TRAVIS_NODE_VERSION="14.10.0" - TRAVIS_NODE_VERSION="12.18.3" - TRAVIS_NODE_VERSION="10.22.0" diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala index 29bcf3414..7ac2cffb3 100644 --- a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala +++ b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala @@ -321,6 +321,15 @@ trait Crypto extends js.Object { js.native def randomFill[T <: scala.scalajs.js.typedarray.TypedArray[_, T]](buffer: T, callback: Callback1[T]): T = js.native + @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14) + def randomInt(max: Int): Int = js.native + @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14) + def randomInt(max: Int, callback: Callback1[Int]): Unit = js.native + @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14) + def randomInt(min: Int, max: Int): Int = js.native + @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14) + def randomInt(min: Int, max: Int, callback: Callback1[Int]): Unit = js.native + def scrypt(password: String, salt: String, keylen: Int, options: ScryptOptions, callback: Callback1[Buffer]): Unit = js.native def scrypt(password: String, diff --git a/app/nodejs-v14/src/test/scala/io/scalajs/nodejs/crypto/CryptoNodeJS14Test.scala b/app/nodejs-v14/src/test/scala/io/scalajs/nodejs/crypto/CryptoNodeJS14Test.scala new file mode 100644 index 000000000..8337fcfee --- /dev/null +++ b/app/nodejs-v14/src/test/scala/io/scalajs/nodejs/crypto/CryptoNodeJS14Test.scala @@ -0,0 +1,28 @@ +package io.scalajs.nodejs.crypto + +import org.scalatest.funsuite.AnyFunSuite + +class CryptoNodeJS14Test extends AnyFunSuite { + test("randomInt") { + val i1 = Crypto.randomInt(10) + assert(0 <= i1 && i1 <= 10) + + val i2 = Crypto.randomInt(10, 100) + assert(10 <= i2 && i2 <= 100) + + Crypto.randomInt( + 10, + (_, i3) => { + assert(0 <= i3 && i3 <= 10) + } + ) + + Crypto.randomInt( + 10, + 100, + (_, i4) => { + assert(10 <= i4 && i4 <= 100) + } + ) + } +} diff --git a/build.sbt b/build.sbt index e00d82605..e8df29946 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ lazy val core = (project in file("./core")) libraryDependencies ++= Dependencies.core.value ) -lazy val nodejs_v14 = createNodeVersionSpecificProject("14.7.0") +lazy val nodejs_v14 = createNodeVersionSpecificProject("14.10.0") lazy val nodejs_v12 = createNodeVersionSpecificProject("12.18.3") lazy val nodejs_v10 = createNodeVersionSpecificProject("10.22.0")