Merge branch 'main' into 3.8.0

mpilquist · mpilquist · commit 8bb1c370f628 · 2025-11-30T15:00:38.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -123,7 +123,7 @@ jobs:
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
           path: targets.tar
@@ -173,7 +173,7 @@ jobs:
         run: sbt +update
 
       - name: Download target directories (2.12, rootJS)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
 
@@ -183,7 +183,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
 
@@ -193,7 +193,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12, rootNative)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
 
@@ -203,7 +203,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, rootJS)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
 
@@ -213,7 +213,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
 
@@ -223,7 +223,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, rootNative)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative
 
@@ -233,7 +233,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3, rootJS)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
 
@@ -243,7 +243,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
 
@@ -253,7 +253,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3, rootNative)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
 
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.9.9"
+version = "3.9.10"
 
 style = default
 
diff --git a/build.sbt b/build.sbt
@@ -8,10 +8,10 @@ ThisBuild / organization := "co.fs2"
 ThisBuild / organizationName := "Functional Streams for Scala"
 ThisBuild / startYear := Some(2013)
 
-val Scala213 = "2.13.16"
+val Scala213 = "2.13.18"
 
 ThisBuild / scalaVersion := Scala213
-ThisBuild / crossScalaVersions := Seq("2.12.20", Scala213, "3.3.6")
+ThisBuild / crossScalaVersions := Seq("2.12.20", Scala213, "3.3.7")
 ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")
 
 ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest")
@@ -450,7 +450,7 @@ lazy val io = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .jvmSettings(
     Test / fork := true,
     libraryDependencies ++= Seq(
-      "com.github.jnr" % "jnr-unixsocket" % "0.38.23" % Optional,
+      "com.github.jnr" % "jnr-unixsocket" % "0.38.24" % Optional,
       "com.google.jimfs" % "jimfs" % "1.3.1" % Test
     )
   )
diff --git a/core/shared/src/main/scala-3/fs2/ChunkPlatform.scala b/core/shared/src/main/scala-3/fs2/ChunkPlatform.scala
@@ -24,7 +24,6 @@ package fs2
 import scodec.bits.ByteVector
 
 import scala.collection.immutable.ArraySeq
-import scala.collection.immutable
 import scala.reflect.ClassTag
 
 private[fs2] trait ChunkPlatform[+O] extends Chunk213And3Compat[O] {
diff --git a/core/shared/src/main/scala/fs2/Chunk.scala b/core/shared/src/main/scala/fs2/Chunk.scala
@@ -1459,6 +1459,7 @@ object Chunk
 
   /** `Traverse`, `Monad`, `Alternative`, and `TraverseFilter` instance for `Chunk`.
     */
+  @nowarn213("msg=parameterless")
   implicit val instance
       : Traverse[Chunk] with Monad[Chunk] with Alternative[Chunk] with TraverseFilter[Chunk] =
     new Traverse[Chunk] with Monad[Chunk] with Alternative[Chunk] with TraverseFilter[Chunk] {
diff --git a/core/shared/src/main/scala/fs2/Stream.scala b/core/shared/src/main/scala/fs2/Stream.scala
@@ -3816,6 +3816,7 @@ object Stream extends StreamLowPriority {
     * are dequeued and emitted as a single chunk.
     */
   @nowarn("msg=never used")
+  @nowarn3("msg=unused implicit parameter")
   def fromQueueNoneTerminated[F[_]: Functor, A](
       queue: QueueSource[F, Option[A]],
       limit: Int = Int.MaxValue
diff --git a/flake.lock b/flake.lock
diff --git a/integration/src/test/scala/fs2/MemoryLeakSpec.scala b/integration/src/test/scala/fs2/MemoryLeakSpec.scala
@@ -218,16 +218,11 @@ class MemoryLeakSpec extends FunSuite {
 
   leakTest("constant eval") {
     var cnt = 0
-    var start = System.currentTimeMillis
     Stream
       .constant(())
       .flatMap { _ =>
         Stream.eval(IO {
           cnt = (cnt + 1) % 1000000
-          if (cnt == 0) {
-            val now = System.currentTimeMillis
-            start = now
-          }
         })
       }
   }
diff --git a/io/js/src/main/scala/fs2/io/internal/facade/net.scala b/io/js/src/main/scala/fs2/io/internal/facade/net.scala
@@ -82,7 +82,7 @@ private[io] object net {
   @js.native
   class Socket extends fs2.io.Duplex {
 
-    def this(options: SocketOptions) = this()
+    def this(@unused options: SocketOptions) = this()
 
     def connect(path: String, connectListener: js.Function0[Unit]): Socket = js.native
 
diff --git a/io/js/src/main/scala/fs2/io/internal/facade/tls.scala b/io/js/src/main/scala/fs2/io/internal/facade/tls.scala
@@ -183,7 +183,7 @@ private[io] object tls {
   @js.native
   class TLSSocket extends Socket {
 
-    def this(socket: fs2.io.Duplex, options: TLSSocketOptions) = this()
+    def this(@unused socket: fs2.io.Duplex, @unused options: TLSSocketOptions) = this()
 
     def alpnProtocol: String | Boolean = js.native
 
diff --git a/io/js/src/main/scala/fs2/io/ioplatform.scala b/io/js/src/main/scala/fs2/io/ioplatform.scala
@@ -32,10 +32,11 @@ import fs2.io.internal.facade
 
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
-import scala.annotation.nowarn
 import scala.scalajs.js
 import scala.scalajs.js.typedarray.Uint8Array
 
+import org.typelevel.scalaccompat.annotation._
+
 private[fs2] trait ioplatform {
 
   @deprecated("Use suspendReadableAndRead instead", "3.1.4")
@@ -423,8 +424,7 @@ private[fs2] trait ioplatform {
   /** Stream of bytes read asynchronously from standard input.
     * Takes a dummy `Int` parameter for source-compatibility with JVM.
     */
-  @nowarn("msg=never used")
-  def stdin[F[_]: Async](ignored: Int): Stream[F, Byte] = stdin
+  def stdin[F[_]: Async](@unused ignored: Int): Stream[F, Byte] = stdin
 
   /** Pipe of bytes that writes emitted values to standard output asynchronously. */
   def stdout[F[_]: Async]: Pipe[F, Byte, Nothing] = stdoutAsync
@@ -451,8 +451,7 @@ private[fs2] trait ioplatform {
   /** Stream of `String` read asynchronously from standard input decoded in UTF-8.
     * Takes a dummy `Int` parameter for source-compatibility with JVM.
     */
-  @nowarn("msg=never used")
-  def stdinUtf8[F[_]: Async](ignored: Int): Stream[F, String] =
+  def stdinUtf8[F[_]: Async](@unused ignored: Int): Stream[F, String] =
     stdinAsync.through(text.utf8.decode)
 
   // Copied JVM implementations, for bincompat
diff --git a/io/jvm/src/main/scala/fs2/io/net/AsynchronousDatagramSocketGroup.scala b/io/jvm/src/main/scala/fs2/io/net/AsynchronousDatagramSocketGroup.scala
@@ -178,11 +178,11 @@ private[net] object AsynchronousDatagramSocketGroup {
 
         onSelectorThread {
           val channel = key.channel.asInstanceOf[DatagramChannel]
-          var cancelReader: () => Unit = null
           if (attachment.hasReaders) {
-            cancelReader = attachment.queueReader(readerId, cb)
+            attachment.queueReader(readerId, cb)
+            ()
           } else if (!read1(channel, cb)) {
-            cancelReader = attachment.queueReader(readerId, cb)
+            attachment.queueReader(readerId, cb)
             try {
               key.interestOps(key.interestOps | SelectionKey.OP_READ); ()
             } catch {
@@ -239,11 +239,10 @@ private[net] object AsynchronousDatagramSocketGroup {
         val attachment = key.attachment.asInstanceOf[Attachment]
         onSelectorThread {
           val channel = key.channel.asInstanceOf[DatagramChannel]
-          var cancelWriter: () => Unit = null
           if (attachment.hasWriters) {
-            cancelWriter = attachment.queueWriter(writerId, (writerDatagram, cb))
+            attachment.queueWriter(writerId, (writerDatagram, cb))
+            ()
           } else if (!write1(channel, writerDatagram, cb)) {
-            cancelWriter = attachment.queueWriter(writerId, (writerDatagram, cb))
             try {
               key.interestOps(key.interestOps | SelectionKey.OP_WRITE); ()
             } catch {
diff --git a/io/native/src/main/scala/fs2/io/ioplatform.scala b/io/native/src/main/scala/fs2/io/ioplatform.scala
@@ -43,7 +43,7 @@ import scala.scalanative.unsigned._
 private[fs2] trait ioplatform extends iojvmnative {
 
   private[io] val PathStreamChunkSize =
-    1 // FIXME https://github.com/scala-native/scala-native/issues/4431
+    16
 
   private[fs2] def fileDescriptorPoller[F[_]: LiftIO]: F[FileDescriptorPoller] =
     IO.pollers
diff --git a/io/native/src/main/scala/fs2/io/net/FdPollingIpSocketsProvider.scala b/io/native/src/main/scala/fs2/io/net/FdPollingIpSocketsProvider.scala
@@ -128,7 +128,7 @@ private final class FdPollingIpSocketsProvider[F[_]: Dns: LiftIO](implicit F: As
                 .to
             }
           }(addrFd => F.delay(guard_(close(addrFd._2))))
-          (address, fd) = addrFd
+          (_, fd) = addrFd
           _ <- Resource.eval {
             val setNonBlock = if (!LinktimeInfo.isLinux) setNonBlocking(fd) else F.unit
             setNonBlock *> options.traverse(so => SocketHelpers.setOption(fd, so.key, so.value))
diff --git a/io/shared/src/test/scala/fs2/io/file/FilesSuite.scala b/io/shared/src/test/scala/fs2/io/file/FilesSuite.scala
@@ -545,18 +545,8 @@ class FilesSuite extends Fs2Suite with BaseFileSuite {
       Stream
         .resource(tempFile)
         .flatMap { p =>
-          Files[IO].list(p).void.recover {
-            // java.io.UncheckedIOException is unavailable in Scala.js
-            case e: RuntimeException if isNative =>
-              e.getCause match {
-                case ex: NotDirectoryException =>
-                  assertEquals(ex.getMessage, p.toString)
-                case other =>
-                  fail(s"Unexpected error $other")
-              }
-
-            case ex: NotDirectoryException =>
-              assertEquals(ex.getMessage, p.toString)
+          Files[IO].list(p).void.recover { case ex: NotDirectoryException =>
+            assertEquals(ex.getMessage, p.toString)
           }
         }
         .compile
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.6
+sbt.version=1.11.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
-val sbtTypelevelVersion = "0.8.1"
+val sbtTypelevelVersion = "0.8.3"
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9")
 addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.4.0")
 addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.12.2")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
diff --git a/protocols/shared/src/main/scala/fs2/protocols/ip/Ipv4Header.scala b/protocols/shared/src/main/scala/fs2/protocols/ip/Ipv4Header.scala
@@ -24,13 +24,13 @@
 package fs2.protocols
 package ip
 
-import scodec.bits._
+import scodec.bits.*
 import scodec.{Codec, SizeBound}
-import scodec.codecs._
-import scodec.compat._
-import fs2.interop.scodec._
+import scodec.codecs.*
+import fs2.interop.scodec.*
 import fs2.protocols.ethernet.{EtherType, EthernetFrameHeader}
 import com.comcast.ip4s.Ipv4Address
+import org.typelevel.scalaccompat.annotation.*
 
 /** IPv4 header. */
 case class Ipv4Header(
@@ -43,7 +43,9 @@ case class Ipv4Header(
     options: BitVector
 ) extends UnsealedIpHeader
 
+@nowarn3("msg=unused import")
 object Ipv4Header {
+  import scodec.compat.*
 
   implicit val codec: Codec[Ipv4Header] = {
     // format: off
diff --git a/protocols/shared/src/main/scala/fs2/protocols/mpeg/PesPacketHeader.scala b/protocols/shared/src/main/scala/fs2/protocols/mpeg/PesPacketHeader.scala
@@ -23,10 +23,10 @@
 
 package fs2.protocols.mpeg
 
-import scodec.bits._
+import scodec.bits.*
 import scodec.Codec
-import scodec.codecs._
-import scodec.compat._
+import scodec.codecs.*
+import org.typelevel.scalaccompat.annotation.*
 
 sealed abstract class PesScramblingControl
 object PesScramblingControl {
@@ -61,7 +61,9 @@ case class PesPacketHeader(
     extension: Option[PesPacketHeader.Extension]
 )
 
+@nowarn3("msg=unused import")
 object PesPacketHeader {
+  import scodec.compat.*
 
   case class Flags(
       ptsFlag: Boolean,
diff --git a/protocols/shared/src/main/scala/fs2/protocols/mpeg/transport/AdaptationField.scala b/protocols/shared/src/main/scala/fs2/protocols/mpeg/transport/AdaptationField.scala
@@ -26,8 +26,8 @@ package transport
 
 import scodec.{Attempt, Codec, DecodeResult, SizeBound}
 import scodec.bits.BitVector
-import scodec.codecs._
-import scodec.compat._
+import scodec.codecs.*
+import org.typelevel.scalaccompat.annotation.*
 
 /** Partial modelling of the adaptation field.
   * The field extension, if present, is ignored upon decoding.
@@ -40,7 +40,9 @@ case class AdaptationField(
     transportPrivateData: Option[BitVector]
 )
 
+@nowarn3("msg=unused import")
 object AdaptationField {
+  import scodec.compat.*
 
   final val Empty: AdaptationField = AdaptationField(None, None, None, None, None)
 
diff --git a/reactive-streams/src/main/scala/fs2/interop/reactivestreams/StreamUnicastPublisher.scala b/reactive-streams/src/main/scala/fs2/interop/reactivestreams/StreamUnicastPublisher.scala
diff --git a/scalafix/project/build.properties b/scalafix/project/build.properties

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.9.9"`
	`1`	`+version = "3.9.10"`
`2`	`2`
`3`	`3`	`style = default`
`4`	`4`