Skip to content

Commit cbcb819

Browse files
authored
Merge branch 'main' into update/scala3-library-3.3.7
2 parents bf6cce7 + 875fa08 commit cbcb819

File tree

7 files changed

+13
-23
lines changed

7 files changed

+13
-23
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ lazy val io = crossProject(JVMPlatform, JSPlatform, NativePlatform)
450450
.jvmSettings(
451451
Test / fork := true,
452452
libraryDependencies ++= Seq(
453-
"com.github.jnr" % "jnr-unixsocket" % "0.38.23" % Optional,
453+
"com.github.jnr" % "jnr-unixsocket" % "0.38.24" % Optional,
454454
"com.google.jimfs" % "jimfs" % "1.3.1" % Test
455455
)
456456
)

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

io/native/src/main/scala/fs2/io/ioplatform.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import scala.scalanative.unsigned._
4343
private[fs2] trait ioplatform extends iojvmnative {
4444

4545
private[io] val PathStreamChunkSize =
46-
1 // FIXME https://github.com/scala-native/scala-native/issues/4431
46+
16
4747

4848
private[fs2] def fileDescriptorPoller[F[_]: LiftIO]: F[FileDescriptorPoller] =
4949
IO.pollers

io/shared/src/test/scala/fs2/io/file/FilesSuite.scala

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -545,18 +545,8 @@ class FilesSuite extends Fs2Suite with BaseFileSuite {
545545
Stream
546546
.resource(tempFile)
547547
.flatMap { p =>
548-
Files[IO].list(p).void.recover {
549-
// java.io.UncheckedIOException is unavailable in Scala.js
550-
case e: RuntimeException if isNative =>
551-
e.getCause match {
552-
case ex: NotDirectoryException =>
553-
assertEquals(ex.getMessage, p.toString)
554-
case other =>
555-
fail(s"Unexpected error $other")
556-
}
557-
558-
case ex: NotDirectoryException =>
559-
assertEquals(ex.getMessage, p.toString)
548+
Files[IO].list(p).void.recover { case ex: NotDirectoryException =>
549+
assertEquals(ex.getMessage, p.toString)
560550
}
561551
}
562552
.compile

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.6
1+
sbt.version=1.11.7

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ val sbtTypelevelVersion = "0.8.1"
22
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
33
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
5-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
5+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9")
66
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.4.0")
77
addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.12.2")
88
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")

scalafix/project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.6
1+
sbt.version=1.11.7

0 commit comments

Comments
 (0)