Merge pull request #3289 from armanbilge/topic/more-merge-fixes

Fix deprecations and tweak Cirrus CI

.cirrus.yml

@@ -1,16 +1,7 @@
 macos_task:
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-base:latest
-  matrix:
-    - name: Node.js Apple Silicon
-      script:
-        - brew install sbt
-        - sbt ioJS/test
-    - name: JVM Apple Silicon
-      script:
-        - brew install sbt
-        - sbt ioJVM/test
-    - name: Native Apple Silicon
-      script:
-        - brew install sbt s2n
-        - sbt ioNative/test
+  name: Apple Silicon 
+  script:
+    - brew install sbt s2n
+    - sbt ioJVM/test ioJS/test ioNative/test

benchmark/src/main/scala/fs2/benchmark/ChunkFlatten.scala

@@ -42,11 +42,11 @@ class ChunkFlatten {
 
   @Setup
   def setup() =
-    chunkSeq = Seq.range(0, numberChunks).map(_ => Chunk.seq(Seq.fill(chunkSize)(Obj.create)))
+    chunkSeq = Seq.range(0, numberChunks).map(_ => Chunk.from(Seq.fill(chunkSize)(Obj.create)))
 
   @Benchmark
   def flatten(): Unit = {
-    Chunk.seq(chunkSeq).flatten
+    Chunk.from(chunkSeq).flatten
     ()
   }
 

core/shared/src/main/scala-2.12/fs2/ChunkPlatform.scala

@@ -83,7 +83,7 @@ private[fs2] trait ChunkCompanionPlatform {
     */
   @deprecated(
     "Use the `from` general factory instead",
-    "3.8.1"
+    "3.9.0"
   )
   def wrappedArray[O](wrappedArray: WrappedArray[O]): Chunk[O] =
     from(wrappedArray)

core/shared/src/main/scala-2.13+/fs2/Chunk213And3Compat.scala

@@ -94,7 +94,7 @@ private[fs2] trait ChunkCompanion213And3Compat {
   /** Creates a chunk backed by an immutable `ArraySeq`. */
   @deprecated(
     "Use the `from` general factory instead",
-    "3.8.1"
+    "3.9.0"
   )
   def arraySeq[O](arraySeq: ArraySeq[O]): Chunk[O] =
     from(arraySeq)

core/shared/src/main/scala/fs2/Chunk.scala

@@ -626,15 +626,15 @@ object Chunk
   /** Creates a chunk backed by a vector. */
   @deprecated(
     "Use the `from` general factory instead",
-    "3.8.1"
+    "3.9.0"
   )
   def vector[O](v: Vector[O]): Chunk[O] =
     from(v)
 
   /** Creates a chunk backed by an `IndexedSeq`. */
   @deprecated(
     "Use the `from` general factory instead",
-    "3.8.1"
+    "3.9.0"
   )
   def indexedSeq[O](s: GIndexedSeq[O]): Chunk[O] =
     from(s)
@@ -723,15 +723,15 @@ object Chunk
   /** Creates a chunk from a `scala.collection.Seq`. */
   @deprecated(
     "Use the `from` general factory instead",
-    "3.8.1"
+    "3.9.0"
   )
   def seq[O](s: GSeq[O]): Chunk[O] =
     from(s)
 
   /** Creates a chunk from a `scala.collection.Iterable`. */
   @deprecated(
     "Use the `from` general factory instead",
-    "3.8.1"
+    "3.9.0"
   )
   def iterable[O](i: GIterable[O]): Chunk[O] =
     from(i)
@@ -781,7 +781,7 @@ object Chunk
     */
   @deprecated(
     "Use the `from` general factory instead",
-    "3.8.1"
+    "3.9.0"
   )
   def arraySeq[O](arraySeq: mutable.ArraySeq[O]): Chunk[O] =
     from(arraySeq)
@@ -1122,7 +1122,7 @@ object Chunk
     */
   @deprecated(
     "Use the `from` general factory instead",
-    "3.8.1"
+    "3.9.0"
   )
   def queue[A](queue: collection.immutable.Queue[A]): Chunk[A] =
     from(queue)