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

Commit b8d584c

Browse files
exoegoexoego
authored
Merge pull request #144 from exoego/drop-nodejs-v8
Drop Node.js v8 support
2 parents 9d231c2 + 41da059 commit b8d584c

File tree

80 files changed

+312
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+312
-587
lines changed

‎.travis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,18 @@ env:
1313
- TRAVIS_NODE_VERSION="12.10.0" JOB_NAME="test"
1414

1515
script:
16-
- sbt ++$TRAVIS_SCALA_VERSION nodejs_v8/test nodejs_v10/test current/test
16+
- sbt ++$TRAVIS_SCALA_VERSION test
1717

1818
matrix:
1919
include:
2020
- scala: 2.13.1
2121
jdk: openjdk11
2222
env: TRAVIS_NODE_VERSION="12.14.0" JOB_NAME="format and doc"
2323
script: sbt ++$TRAVIS_SCALA_VERSION scalafmtSbtCheck scalafmtCheck test:scalafmtCheck current/doc core/doc
24-
- scala: 2.13.1
25-
jdk: openjdk11
26-
env: TRAVIS_NODE_VERSION="8.17.0" JOB_NAME="test"
27-
script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v8/test
2824
- scala: 2.13.1
2925
jdk: openjdk11
3026
env: TRAVIS_NODE_VERSION="10.18.0" JOB_NAME="test"
31-
script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v8/test nodejs_v10/test
27+
script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v10/test
3228

3329
install:
3430
- rm -rf ~/.nvm &&

‎app/current/src/main/scala/io/scalajs/nodejs/Assert.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.scalajs.nodejs
22

3-
import com.thoughtworks.enableIf
43
import io.scalajs.nodejs.events.IEventEmitter
54

65
import scala.scalajs.js
@@ -32,7 +31,6 @@ trait Assert extends IEventEmitter {
3231
*/
3332
def deepStrictEqual(actual: js.Any, expected: js.Any, message: String = js.native): Unit = js.native
3433

35-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
3634
def doesNotReject(asyncFn: js.Function | js.Promise[_],
3735
error: js.RegExp | js.Function = js.native,
3836
message: String = js.native): Unit = js.native
@@ -100,7 +98,6 @@ trait Assert extends IEventEmitter {
10098
error: js.RegExp | js.Function | js.Object | Error,
10199
message: String = js.native): Unit = js.native
102100

103-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
104101
def rejects(asyncFn: js.Function | js.Promise[_],
105102
error: js.RegExp | js.Function | js.Object | Error = js.native,
106103
message: String = js.native): Unit = js.native
@@ -112,6 +109,5 @@ trait Assert extends IEventEmitter {
112109
@js.native
113110
@JSImport("assert", JSImport.Namespace)
114111
object Assert extends Assert {
115-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
116112
val strict: Assert = js.native
117113
}

‎app/current/src/main/scala/io/scalajs/nodejs/Module.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ trait Module extends js.Object {
7070
@js.native
7171
@JSImport("module", JSImport.Namespace)
7272
object Module extends Module {
73-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
7473
var builtinModules: js.Array[String] = js.native
7574

7675
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)

‎app/current/src/main/scala/io/scalajs/nodejs/cluster/ClusterSettings.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.scalajs.nodejs.cluster
22

3-
import com.thoughtworks.enableIf
43
import io.scalajs.nodejs.{GID, UID}
54

65
import scala.scalajs.js
@@ -34,10 +33,8 @@ trait ClusterSettings extends js.Object {
3433

3534
var inspectPort: Int | js.Function = js.native
3635

37-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
3836
var cwd: String = js.native
3937

40-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
4138
var windowsHide: Boolean = js.native
4239
}
4340

‎app/current/src/main/scala/io/scalajs/nodejs/console_module/Console.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.scalajs.nodejs.console_module
22

3-
import com.thoughtworks.enableIf
43
import io.scalajs.nodejs.stream.IWritable
54

65
import scala.scalajs.js
@@ -144,7 +143,6 @@ class Console protected () extends js.Object {
144143
* @param tabularData
145144
* @param properties Alternate properties for constructing the table.
146145
*/
147-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
148146
def table(tabularData: js.Any, properties: js.Array[String] = js.native): Unit = js.native
149147

150148
/**
@@ -164,7 +162,6 @@ class Console protected () extends js.Object {
164162
/**
165163
* Stops a timer that was previously started by calling [[time()]] and prints the result to `.stdout`.`
166164
*/
167-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
168165
def timeLog(label: String, data: js.Any*): Unit = js.native
169166

170167
/**

‎app/current/src/main/scala/io/scalajs/nodejs/crypto/Certificate.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.scalajs.nodejs.crypto
22

3-
import com.thoughtworks.enableIf
43
import io.scalajs.nodejs.buffer.Buffer
54

65
import scala.scalajs.js
@@ -18,12 +17,9 @@ class Certificate extends js.Object {
1817
@js.native
1918
@JSImport("crypto", "Certificate")
2019
object Certificate extends js.Object {
21-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
2220
def exportChallenge(spkac: String | BufferLike): Buffer = js.native
2321

24-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
2522
def exportPublicKey(spkac: String | BufferLike, encoding: String = js.native): Buffer = js.native
2623

27-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
2824
def verifySpkac(spkac: BufferLike): Boolean = js.native
2925
}

‎app/current/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ trait Crypto extends js.Object {
5252
@deprecated("Use crypto.createCipheriv() instead.", "Node.js v10.0")
5353
def createCipher(algorithm: String, password: Buffer | String): Cipher = js.native
5454

55-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
5655
def createCipheriv(algorithm: String,
5756
key: String | BufferLike,
5857
iv: String | BufferLike,
@@ -76,17 +75,15 @@ trait Crypto extends js.Object {
7675
*/
7776
@deprecated("Use crypto.createDecipheriv() instead.", "Node.js v10.0")
7877
def createDecipher(algorithm: String, password: Buffer | String): Decipher = js.native
79-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
78+
8079
def createDecipheriv(algorithm: String,
8180
key: String | BufferLike,
8281
iv: String | BufferLike,
8382
options: TransformOptions = js.native): Decipher = js.native
84-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
8583
def createDecipheriv(algorithm: String,
8684
key: KeyObject,
8785
iv: String | BufferLike,
88-
options: TransformOptions): Decipher = js.native
89-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
86+
options: TransformOptions): Decipher = js.native
9087
def createDecipheriv(algorithm: String, key: KeyObject, iv: String | BufferLike): Decipher = js.native
9188

9289
def createDiffieHellman(prime: String, primeEncoding: String, generator: Int | BufferLike): DiffieHellman = js.native
@@ -151,14 +148,12 @@ trait Crypto extends js.Object {
151148
*/
152149
def createVerify(algorithm: String, options: WritableOptions = js.native): Verify = js.native
153150

154-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
155151
def generateKeyPair(
156152
`type`: String,
157153
options: GenerateKeyPairOptions,
158154
callback: Callback2[String | Buffer | KeyObject, String | Buffer | KeyObject]
159155
): Unit = js.native
160156

161-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
162157
def generateKeyPairSync(`type`: String, options: GenerateKeyPairOptions): KeyPair = js.native
163158

164159
/**
@@ -171,7 +166,6 @@ trait Crypto extends js.Object {
171166

172167
def getDiffieHellman(groupName: String): DiffieHellmanGroup = js.native
173168

174-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
175169
def getFips(): Boolean = js.native
176170

177171
def getHashes(): js.Array[String] = js.native
@@ -227,16 +221,12 @@ trait Crypto extends js.Object {
227221
def randomFillSync(buffer: Buffer, offset: Int): Buffer = js.native
228222
def randomFillSync(buffer: Buffer): Buffer = js.native
229223

230-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
231224
def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView,
232225
offset: Int,
233226
size: Int): scala.scalajs.js.typedarray.DataView = js.native
234-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
235227
def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView, offset: Int): scala.scalajs.js.typedarray.DataView =
236228
js.native
237-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
238229
def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView): scala.scalajs.js.typedarray.DataView = js.native
239-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
240230
def randomFillSync[T <: scala.scalajs.js.typedarray.TypedArray[_, T]](buffer: T,
241231
offset: Int = js.native,
242232
size: Int = js.native): T = js.native
@@ -245,44 +235,36 @@ trait Crypto extends js.Object {
245235
def randomFill(buffer: Buffer, offset: Int, callback: Callback1[Buffer]): Buffer = js.native
246236
def randomFill(buffer: Buffer, callback: Callback1[Buffer]): Buffer = js.native
247237

248-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
249238
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
250239
offset: Int,
251240
size: Int,
252241
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
253242
js.native
254-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
255243
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
256244
offset: Int,
257245
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
258246
js.native
259-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
260247
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
261248
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
262249
js.native
263-
264-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
265250
def randomFill[T <: scala.scalajs.js.typedarray.TypedArray[_, T]](buffer: T,
266251
offset: Int = js.native,
267252
size: Int = js.native,
268253
callback: Callback1[T]): T = js.native
269254

270-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
271255
def scrypt(password: String | BufferLike,
272256
salt: String | BufferLike,
273257
keylen: Int,
274258
options: ScryptOptions = js.native,
275259
callback: Callback1[Buffer]): Unit = js.native
276260

277-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
278261
def scryptSync(password: String | BufferLike,
279262
salt: String | BufferLike,
280263
keylen: Int,
281264
options: ScryptOptions = js.native): Buffer = js.native
282265

283266
def setEngine(engine: String, fips: Int = js.native): Unit = js.native
284267

285-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
286268
def setFips(enable: Boolean): Unit = js.native
287269

288270
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)

‎app/current/src/main/scala/io/scalajs/nodejs/crypto/ECDH.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.scalajs.nodejs.crypto
22

3-
import com.thoughtworks.enableMembersIf
43
import io.scalajs.nodejs.buffer.Buffer
54

65
import scala.scalajs.js
@@ -31,7 +30,6 @@ trait ECDH extends js.Object {
3130
}
3231

3332
@js.native
34-
@enableMembersIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
3533
@JSImport("crypto", "ECDH")
3634
object ECDH extends js.Object {
3735
def convertKey(key: String, curve: String, inputEncoding: String, outputEncoding: String, format: String): String =

‎app/current/src/main/scala/io/scalajs/nodejs/dns/PromiseResolver.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package io.scalajs.nodejs.dns
22

3-
import com.thoughtworks.enableMembersIf
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75

86
@js.native
9-
@enableMembersIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
107
@JSImport("dns", "promises.Resolver")
118
class PromisesResolver extends js.Object {
129
def getServers(): js.Array[String] = js.native

‎app/current/src/main/scala/io/scalajs/nodejs/events/EventEmitter.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ trait IEventEmitter extends js.Object {
7373
*/
7474
def listeners(eventName: String): js.Array[js.Function] = js.native
7575

76-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
7776
def off(eventName: String, listner: js.Function): this.type = js.native
7877

7978
/**
@@ -131,7 +130,6 @@ trait IEventEmitter extends js.Object {
131130
*/
132131
def setMaxListeners(n: Int): this.type = js.native
133132

134-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
135133
def rawListeners(eventName: String): js.Array[js.Function] = js.native
136134
}
137135

‎app/current/src/main/scala/io/scalajs/nodejs/fs/FSConstants.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package io.scalajs.nodejs
22
package fs
33

4-
import com.thoughtworks.enableIf
5-
64
import scala.scalajs.js
75

86
/**
@@ -194,9 +192,7 @@ trait FSConstants extends js.Object {
194192
/////////////////////////////////////////////////////////////////////////////////
195193
// File Copy Constants
196194
/////////////////////////////////////////////////////////////////////////////////
197-
val COPYFILE_EXCL: Int = js.native
198-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
199-
val COPYFILE_FICLONE: Int = js.native
200-
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
195+
val COPYFILE_EXCL: Int = js.native
196+
val COPYFILE_FICLONE: Int = js.native
201197
val COPYFILE_FICLONE_FORCE: Int = js.native
202198
}

0 commit comments

Comments
 (0)