Skip to content

Commit

Permalink
Merge pull request #3014 from typelevel/update/scala-library-2.13.10
Browse files Browse the repository at this point in the history
Update scala-library to 2.13.10
  • Loading branch information
mpilquist authored Oct 16, 2022
2 parents 758a7f1 + 172a2e1 commit 3f0f68b
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 58 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04]
scala: [3.2.0, 2.12.17, 2.13.8]
scala: [3.2.0, 2.12.17, 2.13.10]
java: [temurin@17]
project: [rootJS, rootJVM, rootNative]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' doc

- name: Scalafix tests
if: matrix.scala == '2.13.8' && matrix.project == 'rootJVM'
if: matrix.scala == '2.13.10' && matrix.project == 'rootJVM'
run: |
cd scalafix
sbt testCI
Expand All @@ -124,7 +124,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04]
scala: [2.13.8]
scala: [2.13.10]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -221,32 +221,32 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.8, rootJS)
- name: Download target directories (2.13.10, rootJS)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS

- name: Inflate target directories (2.13.8, rootJS)
- name: Inflate target directories (2.13.10, rootJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.8, rootJVM)
- name: Download target directories (2.13.10, rootJVM)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM

- name: Inflate target directories (2.13.8, rootJVM)
- name: Inflate target directories (2.13.10, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.8, rootNative)
- name: Download target directories (2.13.10, rootNative)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative

- name: Inflate target directories (2.13.8, rootNative)
- name: Inflate target directories (2.13.10, rootNative)
run: |
tar xf targets.tar
rm targets.tar
Expand All @@ -270,7 +270,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.8]
scala: [2.13.10]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ThisBuild / organization := "co.fs2"
ThisBuild / organizationName := "Functional Streams for Scala"
ThisBuild / startYear := Some(2013)

val NewScala = "2.13.8"
val NewScala = "2.13.10"

ThisBuild / crossScalaVersions := Seq("3.2.0", "2.12.17", NewScala)
ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")
Expand Down
3 changes: 0 additions & 3 deletions io/js/src/main/scala/fs2/io/NodeStream.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ package fs2.io

import fs2.io.internal.facade.events.EventEmitter

import scala.annotation.nowarn
import scala.scalajs.js

/** A facade for Node.js `stream.Readable`. Extend or cast to/from your own bindings.
* @see [[https://nodejs.org/api/stream.html]]
*/
@js.native
@nowarn
trait Readable extends EventEmitter {

protected[io] def read(): js.typedarray.Uint8Array = js.native
Expand All @@ -47,7 +45,6 @@ trait Readable extends EventEmitter {
* @see [[https://nodejs.org/api/stream.html]]
*/
@js.native
@nowarn
trait Writable extends EventEmitter {

protected[io] def destroy(): this.type = js.native
Expand Down
2 changes: 0 additions & 2 deletions io/js/src/main/scala/fs2/io/internal/MicrotaskExecutor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ package fs2.io.internal
import scala.scalajs.js
import scala.scalajs.js.annotation.JSGlobal
import scala.concurrent.ExecutionContext
import scala.annotation.nowarn

private[io] object MicrotaskExecutor extends ExecutionContext {

Expand All @@ -34,7 +33,6 @@ private[io] object MicrotaskExecutor extends ExecutionContext {

@JSGlobal("queueMicrotask")
@js.native
@nowarn
private def queueMicrotask(function: js.Function0[Any]): Unit = js.native

}
3 changes: 0 additions & 3 deletions io/js/src/main/scala/fs2/io/internal/facade/dgram.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

package fs2.io.internal.facade

import scala.annotation.nowarn
import scala.scalajs.js
import scala.scalajs.js.annotation.JSImport
import scala.scalajs.js.typedarray.Uint8Array
Expand All @@ -32,7 +31,6 @@ package object dgram {

@js.native
@JSImport("dgram", "createSocket")
@nowarn
private[io] def createSocket(`type`: String): Socket =
js.native

Expand All @@ -41,7 +39,6 @@ package object dgram {
package dgram {

@js.native
@nowarn
private[io] trait Socket extends EventEmitter {

def address(): AddressInfo = js.native
Expand Down
2 changes: 0 additions & 2 deletions io/js/src/main/scala/fs2/io/internal/facade/events.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@ import cats.effect.kernel.Sync
import cats.effect.std.Dispatcher
import cats.syntax.all._

import scala.annotation.nowarn
import scala.scalajs.js

@js.native
@nowarn
private[io] trait EventEmitter extends js.Object {

protected[io] def on[E](eventName: String, listener: js.Function1[E, Unit]): this.type = js.native
Expand Down
3 changes: 0 additions & 3 deletions io/js/src/main/scala/fs2/io/internal/facade/fs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,11 @@ package object fs {

@js.native
@JSImport("fs", "createReadStream")
@nowarn
private[io] def createReadStream(path: String, options: ReadStreamOptions): fs2.io.Readable =
js.native

@js.native
@JSImport("fs", "createWriteStream")
@nowarn
private[io] def createWriteStream(path: String, options: WriteStreamOptions): fs2.io.Writable =
js.native

Expand Down Expand Up @@ -201,7 +199,6 @@ package fs {
}

@js.native
@nowarn
private[io] trait FileHandle extends js.Object {

def datasync(): js.Promise[Unit] = js.native
Expand Down
4 changes: 0 additions & 4 deletions io/js/src/main/scala/fs2/io/internal/facade/net.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

package fs2.io.internal.facade

import scala.annotation.nowarn
import scala.scalajs.js
import scala.scalajs.js.annotation.JSImport

Expand All @@ -30,7 +29,6 @@ import events.EventEmitter
package object net {
@js.native
@JSImport("net", "createServer")
@nowarn
private[io] def createServer(
options: ServerOptions,
connectionListener: js.Function1[Socket, Unit]
Expand All @@ -41,7 +39,6 @@ package object net {
package net {

@js.native
@nowarn
private[io] trait Server extends EventEmitter {

def address(): ServerAddress = js.native
Expand Down Expand Up @@ -83,7 +80,6 @@ package net {

@JSImport("net", "Socket")
@js.native
@nowarn
private[io] class Socket extends fs2.io.Duplex {

def this(options: SocketOptions) = this()
Expand Down
9 changes: 0 additions & 9 deletions io/js/src/main/scala/fs2/io/internal/facade/path.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

package fs2.io.internal.facade

import scala.annotation.nowarn
import scala.scalajs.js
import scala.scalajs.js.annotation.JSImport

Expand All @@ -33,42 +32,34 @@ package object path {

@js.native
@JSImport("path", "join")
@nowarn
private[io] def join(paths: String*): String = js.native

@js.native
@JSImport("path", "resolve")
@nowarn
private[io] def resolve(paths: String*): String = js.native

@js.native
@JSImport("path", "relative")
@nowarn
private[io] def relative(from: String, to: String): String = js.native

@js.native
@JSImport("path", "normalize")
@nowarn
private[io] def normalize(path: String): String = js.native

@js.native
@JSImport("path", "isAbsolute")
@nowarn
private[io] def isAbsolute(path: String): Boolean = js.native

@js.native
@JSImport("path", "basename")
@nowarn
private[io] def basename(path: String): String = js.native

@js.native
@JSImport("path", "extname")
@nowarn
private[io] def extname(path: String): String = js.native

@js.native
@JSImport("path", "parse")
@nowarn
private[io] def parse(path: String): ParsedPath = js.native

}
Expand Down
3 changes: 0 additions & 3 deletions io/js/src/main/scala/fs2/io/internal/facade/tls.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ package fs2.io.internal.facade

import fs2.io.net.tls.SecureContext

import scala.annotation.nowarn
import scala.scalajs.js
import scala.scalajs.js.annotation.JSImport
import scala.scalajs.js.typedarray.Uint8Array
Expand All @@ -35,13 +34,11 @@ package object tls {

@js.native
@JSImport("tls", "connect")
@nowarn
private[io] def connect(options: TLSConnectOptions): TLSSocket =
js.native

@js.native
@JSImport("tls", "createSecureContext")
@nowarn
private[io] def createSecureContext(
options: js.UndefOr[SecureContextOptions] = js.undefined
): SecureContext =
Expand Down
13 changes: 0 additions & 13 deletions io/js/src/main/scala/fs2/io/internal/facade/zlib.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

package fs2.io.internal.facade

import scala.annotation.nowarn
import scala.scalajs.js
import scala.scalajs.js.annotation.JSImport
import scala.scalajs.js.typedarray.Uint8Array
Expand All @@ -30,65 +29,53 @@ package object zlib {

@js.native
@JSImport("zlib", "createDeflate")
@nowarn
private[io] def createDeflate(options: Options): Zlib = js.native

@js.native
@JSImport("zlib", "createDeflateRaw")
@nowarn
private[io] def createDeflateRaw(options: Options): Zlib = js.native

@js.native
@JSImport("zlib", "deflateSync")
@nowarn
private[io] def deflateSync(buffer: Uint8Array, options: Options): Uint8Array = js.native

@js.native
@JSImport("zlib", "createGzip")
@nowarn
private[io] def createGzip(options: Options): Zlib = js.native

@js.native
@JSImport("zlib", "deflateRawSync")
@nowarn
private[io] def deflateRawSync(buffer: Uint8Array, options: Options): Uint8Array = js.native

@js.native
@JSImport("zlib", "createGunzip")
@nowarn
private[io] def createGunzip(options: Options): Zlib = js.native

@js.native
@JSImport("zlib", "inflateRawSync")
@nowarn
private[io] def inflateRawSync(buffer: Uint8Array, options: Options): Uint8Array = js.native

@js.native
@JSImport("zlib", "createInflate")
@nowarn
private[io] def createInflate(options: Options): Zlib = js.native

@js.native
@JSImport("zlib", "createInflateRaw")
@nowarn
private[io] def createInflateRaw(options: Options): Zlib = js.native

@js.native
@JSImport("zlib", "inflateSync")
@nowarn
private[io] def inflateSync(buffer: Uint8Array, options: Options): Uint8Array = js.native

@js.native
@JSImport("zlib", "gunzipSync")
@nowarn
private[io] def gunzipSync(buffer: Uint8Array): Uint8Array = js.native

}

package zlib {

@js.native
@nowarn
private[io] trait Zlib extends fs2.io.Duplex {
def close(cb: js.Function0[Unit]): Unit = js.native
}
Expand Down
2 changes: 0 additions & 2 deletions io/native/src/main/scala/fs2/io/net/tls/s2n.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
package fs2.io.net.tls

import scala.scalanative.unsafe._
import scala.annotation.nowarn

@extern
@link("s2n")
@nowarn
private[tls] object s2n {

final val S2N_SUCCESS = 0
Expand Down

0 comments on commit 3f0f68b

Please sign in to comment.