Merge branch 'main' into topic/hashing

typelevel · Jul 5, 2024 · 8b0191a · 8b0191a
2 parents a458a68 + 8e4181f
commit 8b0191a
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -18,3 +18,6 @@ f5a03308a9e740e75a1e69fe9a09b2e16b498c5e
 
 # Scala Steward: Reformat with scalafmt 3.7.1
 e5525d3f0da44052fdcfbe844993260bdc044270
+
+# Scala Steward: Reformat with scalafmt 3.8.2
+a0a37ece16ee55056270b4d9ba5c1505ead8af17
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.1"
+version = "3.8.2"
 
 style = default
 

diff --git a/README.md b/README.md
@@ -28,12 +28,10 @@ Quick links:
 
 [microsite]: http://fs2.io
 [api]: https://www.javadoc.io/doc/co.fs2/fs2-docs_2.13/latest/fs2/index.html
-[io-api]: https://oss.sonatype.org/service/local/repositories/releases/archive/co/fs2/fs2-io_2.13/3.1.0/fs2-io_2.13-3.1.0-javadoc.jar/!/fs2/io/index.html
-[rx-api]: https://oss.sonatype.org/service/local/repositories/releases/archive/co/fs2/fs2-reactive-streams_2.13/3.1.0/fs2-reactive-streams_2.13-3.1.0-javadoc.jar/!/fs2/interop/reactivestreams/index.html
 
 ### <a id="docs"></a>Documentation and getting help ###
 
-* There are Scaladoc API documentations for [the core library][core-api], which defines and implements the core types for streams and pulls, as well as the type aliases for pipes and sinks. [The `io` library][io-api] provides FS2 bindings for NIO-based file I/O and TCP/UDP networking.
+* There are [Scaladoc API documentations][api] for the library.
 * [The official guide](https://fs2.io/#/guide) is a good starting point for learning more about the library.
 * The [documentation page](https://fs2.io/#/documentation) is intended to serve as a list of all references, including conference presentation recordings, academic papers, and blog posts, on the use and implementation of `fs2`.
 * [The FAQ](https://fs2.io/#/faq) has frequently asked questions. Feel free to open issues or PRs with additions to the FAQ!

diff --git a/build.sbt b/build.sbt
@@ -334,7 +334,7 @@ lazy val io = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .settings(
     name := "fs2-io",
     tlVersionIntroduced ~= { _.updated("3", "3.1.0") },
-    libraryDependencies += "com.comcast" %%% "ip4s-core" % "3.5.0",
+    libraryDependencies += "com.comcast" %%% "ip4s-core" % "3.6.0",
     tlJdkRelease := None
   )
   .jvmSettings(

diff --git a/flake.lock b/flake.lock
diff --git a/io/jvm/src/main/scala/fs2/io/net/tls/TLSEngine.scala b/io/jvm/src/main/scala/fs2/io/net/tls/TLSEngine.scala
@@ -216,9 +216,8 @@ private[tls] object TLSEngine {
                 binding.read(engine.getSession.getPacketBufferSize).flatMap {
                   case Some(c) => unwrapBuffer.input(c) >> unwrapHandshake
                   case None =>
-                    unwrapBuffer.inputRemains.flatMap(x =>
-                      if (x > 0) Applicative[F].unit else stopUnwrap
-                    )
+                    unwrapBuffer.inputRemains
+                      .flatMap(x => if (x > 0) Applicative[F].unit else stopUnwrap)
                 }
             }
           case SSLEngineResult.HandshakeStatus.NEED_UNWRAP_AGAIN =>

diff --git a/site/guide.md b/site/guide.md
@@ -428,7 +428,7 @@ import cats.effect.IO
 Stream(1,2,3).merge(Stream.eval(IO { Thread.sleep(200); 4 })).compile.toVector.unsafeRunSync()
 ```
 
-Oops, we need a `cats.effect.ContextShift[IO]` in implicit scope. Let's add that:
+Oops, we need a `cats.effect.unsafe.IORuntime` in implicit scope. Let's add that:
 
 ```scala mdoc
 import cats.effect.IO