Merge pull request #300 from exoego/scala-upgrade

exoego · web-flow · commit 6c17bf296551 · 2020-07-30T17:15:57.000+09:00
Scala upgrade
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@ dist: xenial
 language: scala
 
 scala:
-  - 2.12.11
-  - 2.13.2
+  - 2.12.12
+  - 2.13.3
 
 jdk:
   - openjdk11
diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala
@@ -32,7 +32,7 @@ class ChildProcessTest extends AsyncFunSpec {
         "cat ./package.json | wc -l",
         callback = (error: Error, stdout: Output, stderr: Output) => {
           if (isDefined(error)) {
-            promise.failure(error.toException)
+            promise.failure(error.toException())
           } else {
             promise.success((stdout, stderr))
           }
@@ -52,7 +52,7 @@ class ChildProcessTest extends AsyncFunSpec {
         js.Array("-l"),
         callback = (error: Error, stdout: Output, stderr: Output) => {
           if (isDefined(error)) {
-            promise.failure(error.toException)
+            promise.failure(error.toException())
           } else {
             promise.success((stdout, stderr))
           }
diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala
@@ -33,7 +33,7 @@ class FsTest extends AsyncFunSpec {
           "Hello",
           error => {
             if (isDefined(error)) {
-              promise.failure(error.toException)
+              promise.failure(error.toException())
             }
           }
         )
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/Assert.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/Assert.scala
@@ -2,7 +2,6 @@ package io.scalajs.nodejs
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * The assert module provides a simple set of assertion tests that can be used to test invariants. The module is
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/StringDecoder.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/StringDecoder.scala
@@ -5,7 +5,6 @@ import io.scalajs.nodejs.events.IEventEmitter
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.typedarray.{DataView, TypedArray}
-import scala.scalajs.js.|
 
 /**
   * To use this module, do require('string_decoder'). StringDecoder decodes a buffer to a string. It is a simple
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/buffer/Buffer.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/buffer/Buffer.scala
@@ -5,7 +5,6 @@ import com.thoughtworks.enableIf
 import scala.scalajs.js
 import scala.scalajs.js.annotation.{JSBracketAccess, JSGlobal, JSImport}
 import scala.scalajs.js.typedarray.{ArrayBuffer, DataView, TypedArray, Uint8Array}
-import scala.scalajs.js.|
 
 /**
   * @see [[https://nodejs.org/api/buffer.html]]
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Certificate.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Certificate.scala
@@ -4,7 +4,6 @@ import io.scalajs.nodejs.buffer.Buffer
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 @js.native
 @JSImport("crypto", "Certificate")
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Sign.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Sign.scala
@@ -5,7 +5,6 @@ import io.scalajs.nodejs.buffer.Buffer
 import io.scalajs.nodejs.stream.Writable
 
 import scala.scalajs.js
-import scala.scalajs.js.|
 
 /**
   * The Sign Class is a utility for generating signatures. It can be used in one of two ways:
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Verify.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/Verify.scala
@@ -5,7 +5,6 @@ import io.scalajs.nodejs.buffer.Buffer
 import io.scalajs.nodejs.stream.Writable
 
 import scala.scalajs.js
-import scala.scalajs.js.|
 
 /**
   * The Verify class is a utility for verifying signatures. It can be used in one of two ways:
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/dns/DNS.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/dns/DNS.scala
@@ -4,7 +4,6 @@ import com.thoughtworks.enableIf
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * The dns module contains functions belonging to two different categories:
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/http/Http.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/http/Http.scala
@@ -5,7 +5,6 @@ import io.scalajs.nodejs.url.URL
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * To use the HTTP server and client one must require('http').
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/http/ServerResponse.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/http/ServerResponse.scala
@@ -2,7 +2,6 @@ package io.scalajs.nodejs
 package http
 
 import scala.scalajs.js
-import scala.scalajs.js.|
 
 /**
   * Node.js http.ServerResponse
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/http2/Http2.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/http2/Http2.scala
@@ -6,7 +6,6 @@ import io.scalajs.nodejs.url.URL
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.typedarray.Uint8Array
-import scala.scalajs.js.|
 
 @js.native
 trait Http2 extends js.Object {
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala
@@ -1,6 +1,5 @@
 package io.scalajs.nodejs.http2
 
-import io.scalajs.nodejs.buffer.Buffer
 import io.scalajs.nodejs.{net, tls, stream}
 
 import scala.scalajs.js
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/https/Https.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/https/Https.scala
@@ -5,7 +5,6 @@ import io.scalajs.nodejs.url.URL
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * HTTPS is the HTTP protocol over TLS/SSL. In Node.js this is implemented as a separate module.
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/https/package.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/https/package.scala
@@ -1,13 +1,11 @@
 package io.scalajs.nodejs
 
 import com.thoughtworks.enableIf
-import io.scalajs.nodejs.buffer.Buffer
 import io.scalajs.nodejs.http.{RequestOptions, ServerResponse}
 import io.scalajs.util.PromiseHelper._
 import io.scalajs.nodejs.url.URL
 
 import scala.concurrent.Future
-import scala.scalajs.js.|
 
 /**
   * https package object
@@ -63,6 +61,7 @@ package object https {
 
   implicit final class AgentExtensions[T <: Agent](private val instance: T) extends AnyVal {
     @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
-    @inline def onKeylog(handler: (Buffer, tls.TLSSocket) => Any): T = instance.on("keylog", handler)
+    @inline def onKeylog(handler: (io.scalajs.nodejs.buffer.Buffer, tls.TLSSocket) => Any): T =
+      instance.on("keylog", handler)
   }
 }
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/process/Process.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/process/Process.scala
@@ -7,7 +7,6 @@ import net.exoego.scalajs.types.util.Factory
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSGlobal
-import scala.scalajs.js.|
 
 /**
   * The process object is a global object and can be accessed from anywhere. It is an instance of EventEmitter.
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/repl/REPLServer.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/repl/REPLServer.scala
@@ -6,7 +6,6 @@ import io.scalajs.nodejs.readline.Interface
 import net.exoego.scalajs.types.util.Factory
 
 import scala.scalajs.js
-import scala.scalajs.js.|
 
 /**
   * REPL Server
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/stream/package.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/stream/package.scala
@@ -6,7 +6,6 @@ import io.scalajs.util.PromiseHelper.promiseWithError0
 import scala.concurrent.Future
 import scala.scalajs.js
 import scala.scalajs.js.typedarray.Uint8Array
-import scala.scalajs.js.|
 
 package object stream {
   type ErrorCallback = js.Function1[io.scalajs.nodejs.Error, Any]
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/tls/ConnectOptions.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/tls/ConnectOptions.scala
@@ -1,7 +1,5 @@
 package io.scalajs.nodejs.tls
 
-import io.scalajs.nodejs.net
-
 import io.scalajs.nodejs.buffer.Buffer
 import io.scalajs.nodejs.{net, stream}
 import _root_.net.exoego.scalajs.types.util.Factory
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/url/URL.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/url/URL.scala
@@ -3,7 +3,6 @@ package url
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 @js.native
 @JSImport("url", "URL")
diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/util/TextDecoder.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/util/TextDecoder.scala
@@ -5,7 +5,7 @@ import net.exoego.scalajs.types.util.Factory
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.typedarray.{ArrayBuffer, ArrayBufferView}
-import scala.scalajs.js.|
+
 @js.native
 @JSImport("util", "TextDecoder")
 class TextDecoder() extends js.Object {
diff --git a/project/MySettings.scala b/project/MySettings.scala
@@ -11,7 +11,6 @@ object MySettings {
       "adapted-args",
       "nullary-unit",
       "inaccessible",
-      "nullary-override",
       "infer-any",
       "missing-interpolator",
       "doc-detached",

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class FsTest extends AsyncFunSpec {`
`33`	`33`	`"Hello",`
`34`	`34`	`error => {`
`35`	`35`	`if (isDefined(error)) {`
`36`		`- promise.failure(error.toException)`
	`36`	`+ promise.failure(error.toException())`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`)`