Skip to content

Commit 156ad3c

Browse files
committed
Merge branch 'main' into fix-issue-3642
2 parents 0882845 + 77396ff commit 156ad3c

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
timeout-minutes: 60
4545
steps:
4646
- name: Checkout current branch (full)
47-
uses: actions/checkout@v5
47+
uses: actions/checkout@v6
4848
with:
4949
fetch-depth: 0
5050

@@ -139,7 +139,7 @@ jobs:
139139
runs-on: ${{ matrix.os }}
140140
steps:
141141
- name: Checkout current branch (full)
142-
uses: actions/checkout@v5
142+
uses: actions/checkout@v6
143143
with:
144144
fetch-depth: 0
145145

@@ -296,7 +296,7 @@ jobs:
296296
runs-on: ${{ matrix.os }}
297297
steps:
298298
- name: Checkout current branch (full)
299-
uses: actions/checkout@v5
299+
uses: actions/checkout@v6
300300
with:
301301
fetch-depth: 0
302302

@@ -345,7 +345,7 @@ jobs:
345345
runs-on: ${{ matrix.os }}
346346
steps:
347347
- name: Checkout current branch (full)
348-
uses: actions/checkout@v5
348+
uses: actions/checkout@v6
349349
with:
350350
fetch-depth: 0
351351

@@ -392,7 +392,7 @@ jobs:
392392
runs-on: ${{ matrix.os }}
393393
steps:
394394
- name: Checkout current branch (full)
395-
uses: actions/checkout@v5
395+
uses: actions/checkout@v6
396396
with:
397397
fetch-depth: 0
398398

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.10.2"
1+
version = "3.10.3"
22

33
style = default
44

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ThisBuild / startYear := Some(2013)
1111
val Scala213 = "2.13.18"
1212

1313
ThisBuild / scalaVersion := Scala213
14-
ThisBuild / crossScalaVersions := Seq("2.12.20", Scala213, "3.3.7")
14+
ThisBuild / crossScalaVersions := Seq("2.12.21", Scala213, "3.3.7")
1515
ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")
1616

1717
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest")

flake.lock

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

io/shared/src/test/scala/fs2/io/net/SocketSuite.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,13 @@ class SocketSuite extends Fs2Suite with SocketSuitePlatform {
184184
.attempt
185185
.map {
186186
case Left(ex: Ip4sUnknownHostException) =>
187-
assert(
188-
ex.getMessage == "not.example.com: Name or service not known" || ex.getMessage == "not.example.com: nodename nor servname provided, or not known"
187+
val msg = ex.getMessage
188+
val expected = List(
189+
"not.example.com: Name or service not known",
190+
"not.example.com: nodename nor servname provided, or not known",
191+
"not.example.com: No address associated with hostname"
189192
)
193+
assert(expected.contains(msg), msg)
190194
case _ => assert(false)
191195
}
192196

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
val sbtTypelevelVersion = "0.8.3"
1+
val sbtTypelevelVersion = "0.8.4"
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")
55
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9")
66
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.4.0")
7-
addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.12.2")
7+
addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.12.3")
88
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
99

1010
libraryDependencySchemes += "com.lihaoyi" %% "geny" % VersionScheme.Always

0 commit comments

Comments
 (0)