diff --git a/README.md b/README.md index e94e1f21d..6e1538790 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,12 @@ The following core Node.js modules (v8.7.0+) have been implemented: Add below line to your SBT project. ```sbt -libraryDependencies += "net.exoego" %%% "scala-js-nodejs-v8" % "0.8.0" +// For Node.js v8 LTS +libraryDependencies += "net.exoego" %%% "scala-js-nodejs-v8" % "0.9.0" +// For Node.js v10 LTS +libraryDependencies += "net.exoego" %%% "scala-js-nodejs-v10" % "0.9.0" +// For Node.js v12 (supposed to be next LTS) +libraryDependencies += "net.exoego" %%% "scala-js-nodejs-v2" % "0.9.0" ``` ## Example of code diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/assertion/AssertTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/assertion/AssertTest.scala index 783f74f16..13aafadc3 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/assertion/AssertTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/assertion/AssertTest.scala @@ -1,7 +1,7 @@ package io.scalajs.nodejs.assertion import org.scalatest.FunSpec -import io.scalajs.nodejs.{ Assert => NodeAssert } +import io.scalajs.nodejs.{Assert => NodeAssert} import scala.scalajs.js diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala index 2b6b68560..d13fd623e 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala @@ -1,7 +1,7 @@ package io.scalajs.nodejs.console_module import io.scalajs.nodejs.fs.Fs -import org.scalatest.{ BeforeAndAfterEach, FunSpec } +import org.scalatest.{BeforeAndAfterEach, FunSpec} import scala.scalajs.js diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CertificateTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CertificateTest.scala index e4c63af67..c0ff83685 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CertificateTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CertificateTest.scala @@ -1,10 +1,11 @@ package io.scalajs.nodejs.crypto import io.scalajs.nodejs.buffer.Buffer -import org.scalatest.{ FunSpec, MustMatchers } +import org.scalatest.{FunSpec, MustMatchers} class CertificateTest extends FunSpec with MustMatchers { - val spkacExample = "MIIBXjCByDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3L0IfUijj7+A8CPC8EmhcdNoe5fUAog7OrBdhn7EkxFButUp40P7+LiYiygYG1TmoI/a5EgsLU3s9twEz3hmgY9mYIqb/rb+SF8qlD/K6KVyUORC7Wlz1Df4L8O3DuRGzx6/+3jIW6cPBpfgH1sVuYS1vDBsP/gMMIxwTsKJ4P0CAwEAARYkYzBkZjFlYjctMTU0NC00MWVkLWFmN2EtZDRkYjBkNDc5ZjZmMA0GCSqGSIb3DQEBBAUAA4GBALEiapUjaIPs5uEdvCP0gFK2qofo+4GpeK1A43mu28lirYPAvCWsmYvKIZIT9TxvzmQIxAfxobf70aSNlSm6MJJKmvurAK+Bpn6ZUKQZ6A1m927LvctVSYJuUi+WVmr0fGE/OfdQ+BqSm/eQ3jnm3fBPVx1uwLPgjC5g4EvGMh8M" + val spkacExample = + "MIIBXjCByDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3L0IfUijj7+A8CPC8EmhcdNoe5fUAog7OrBdhn7EkxFButUp40P7+LiYiygYG1TmoI/a5EgsLU3s9twEz3hmgY9mYIqb/rb+SF8qlD/K6KVyUORC7Wlz1Df4L8O3DuRGzx6/+3jIW6cPBpfgH1sVuYS1vDBsP/gMMIxwTsKJ4P0CAwEAARYkYzBkZjFlYjctMTU0NC00MWVkLWFmN2EtZDRkYjBkNDc5ZjZmMA0GCSqGSIb3DQEBBAUAA4GBALEiapUjaIPs5uEdvCP0gFK2qofo+4GpeK1A43mu28lirYPAvCWsmYvKIZIT9TxvzmQIxAfxobf70aSNlSm6MJJKmvurAK+Bpn6ZUKQZ6A1m927LvctVSYJuUi+WVmr0fGE/OfdQ+BqSm/eQ3jnm3fBPVx1uwLPgjC5g4EvGMh8M" describe("Certificate object") { it("exportChallenge") { @@ -12,14 +13,16 @@ class CertificateTest extends FunSpec with MustMatchers { } it("exportPublicKey") { - assert(Certificate.exportPublicKey(spkacExample).toString("utf8") === - """-----BEGIN PUBLIC KEY----- + assert( + Certificate.exportPublicKey(spkacExample).toString("utf8") === + """-----BEGIN PUBLIC KEY----- |MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcvQh9SKOPv4DwI8LwSaFx02h7 |l9QCiDs6sF2GfsSTEUG61SnjQ/v4uJiLKBgbVOagj9rkSCwtTez23ATPeGaBj2Zg |ipv+tv5IXyqUP8ropXJQ5ELtaXPUN/gvw7cO5EbPHr/7eMhbpw8Gl+AfWxW5hLW8 |MGw/+AwwjHBOwong/QIDAQAB |-----END PUBLIC KEY----- - |""".stripMargin) + |""".stripMargin + ) } it("verifySpkac") { diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CryptoTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CryptoTest.scala index f249711c9..d7bdfe5a6 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CryptoTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CryptoTest.scala @@ -1,36 +1,37 @@ package io.scalajs.nodejs.crypto import io.scalajs.nodejs.buffer.Buffer -import org.scalatest.{ FunSpec, MustMatchers } +import org.scalatest.{FunSpec, MustMatchers} import scala.scalajs.js -import scala.scalajs.js.typedarray.{ DataView, _ } +import scala.scalajs.js.typedarray.{DataView, _} class CryptoTest extends FunSpec with MustMatchers { - val spkacExample = "MIIBXjCByDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3L0IfUijj7+A8CPC8EmhcdNoe5fUAog7OrBdhn7EkxFButUp40P7+LiYiygYG1TmoI/a5EgsLU3s9twEz3hmgY9mYIqb/rb+SF8qlD/K6KVyUORC7Wlz1Df4L8O3DuRGzx6/+3jIW6cPBpfgH1sVuYS1vDBsP/gMMIxwTsKJ4P0CAwEAARYkYzBkZjFlYjctMTU0NC00MWVkLWFmN2EtZDRkYjBkNDc5ZjZmMA0GCSqGSIb3DQEBBAUAA4GBALEiapUjaIPs5uEdvCP0gFK2qofo+4GpeK1A43mu28lirYPAvCWsmYvKIZIT9TxvzmQIxAfxobf70aSNlSm6MJJKmvurAK+Bpn6ZUKQZ6A1m927LvctVSYJuUi+WVmr0fGE/OfdQ+BqSm/eQ3jnm3fBPVx1uwLPgjC5g4EvGMh8M" + val spkacExample = + "MIIBXjCByDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3L0IfUijj7+A8CPC8EmhcdNoe5fUAog7OrBdhn7EkxFButUp40P7+LiYiygYG1TmoI/a5EgsLU3s9twEz3hmgY9mYIqb/rb+SF8qlD/K6KVyUORC7Wlz1Df4L8O3DuRGzx6/+3jIW6cPBpfgH1sVuYS1vDBsP/gMMIxwTsKJ4P0CAwEAARYkYzBkZjFlYjctMTU0NC00MWVkLWFmN2EtZDRkYjBkNDc5ZjZmMA0GCSqGSIb3DQEBBAUAA4GBALEiapUjaIPs5uEdvCP0gFK2qofo+4GpeK1A43mu28lirYPAvCWsmYvKIZIT9TxvzmQIxAfxobf70aSNlSm6MJJKmvurAK+Bpn6ZUKQZ6A1m927LvctVSYJuUi+WVmr0fGE/OfdQ+BqSm/eQ3jnm3fBPVx1uwLPgjC5g4EvGMh8M" describe("Crypto object") { describe("randomFillSync") { it("should accept Buffer and return value in type as received") { - val buffer = Buffer.alloc(5) + val buffer = Buffer.alloc(5) val result1 = Crypto.randomFillSync(buffer) assert(result1.length === 5) assert(result1.isInstanceOf[Buffer]) } it("should accept DataView and return value in type as received") { - val view = new DataView(new ArrayBuffer(4)) + val view = new DataView(new ArrayBuffer(4)) val result1 = Crypto.randomFillSync(view) assert(result1.isInstanceOf[DataView]) } it("should accept any TypedArray and return value in type as received") { - val array1 = Uint8Array.from(js.Array[Short](1,2,3)) + val array1 = Uint8Array.from(js.Array[Short](1, 2, 3)) val result1 = Crypto.randomFillSync(array1) assert(result1.length === 3) assert(result1.isInstanceOf[Uint8Array]) - val array2 = Uint16Array.from(js.Array[Int](1,2,3,4)) + val array2 = Uint16Array.from(js.Array[Int](1, 2, 3, 4)) val result2 = Crypto.randomFillSync(array2) assert(result2.length === 4) assert(result2.isInstanceOf[Uint16Array]) diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala index 37d86c84b..9513cd1cd 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala @@ -10,7 +10,7 @@ import scala.scalajs.js * DNS Tests */ class DNSAsyncTest extends AsyncFunSpec { - private val domain = "google.com" + private val domain = "google.com" private val resolver = new DNS.promises.Resolver() override implicit val executionContext = ExecutionContext.Implicits.global diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala index 8075fd234..575a1af94 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala @@ -1,6 +1,6 @@ package io.scalajs.nodejs.fs -import org.scalatest.{ AsyncFunSpec, BeforeAndAfterEach } +import org.scalatest.{AsyncFunSpec, BeforeAndAfterEach} import scala.concurrent.ExecutionContext diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/process/ProcessTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/process/ProcessTest.scala index 399d5f9d2..2b14a63cd 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/process/ProcessTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/process/ProcessTest.scala @@ -2,7 +2,7 @@ package io.scalajs.nodejs.process import org.scalatest.FunSpec -class ProcessTest extends FunSpec{ +class ProcessTest extends FunSpec { describe("Process") { it("hrtime.bigint") { diff --git a/build.sbt b/build.sbt index 0915da8b3..6b17693f3 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization in ThisBuild := "net.exoego" lazy val root = (project in file(".")) - .aggregate(core, current, nodejs_v8) + .aggregate(core, current, nodejs_v10, nodejs_v8) .settings(MySettings.commonSettings) .settings(MySettings.publishingSettings) .settings(MySettings.nonPublishingSetting) diff --git a/version.sbt b/version.sbt index e74ced496..972f262e9 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.8.1-SNAPSHOT" +version in ThisBuild := "0.9.1-SNAPSHOT"