Skip to content

Commit b8ac21c

Browse files
Merge branch 'main' into update/scala-library-2.13.11
2 parents 6c0e653 + 583a472 commit b8ac21c

File tree

6 files changed

+19
-25
lines changed

6 files changed

+19
-25
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest, macos-latest]
31-
scala: [3.2.2, 2.12.17, 2.13.10]
31+
scala: [3.3.0, 2.12.17, 2.13.10]
3232
java: [temurin@17]
3333
project: [rootJS, rootJVM, rootNative]
3434
exclude:
35-
- scala: 3.2.2
35+
- scala: 3.3.0
3636
os: macos-latest
3737
- scala: 2.12.17
3838
os: macos-latest
@@ -169,32 +169,32 @@ jobs:
169169
~/Library/Caches/Coursier/v1
170170
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
171171

172-
- name: Download target directories (3.2.2, rootJS)
172+
- name: Download target directories (3.3.0, rootJS)
173173
uses: actions/download-artifact@v3
174174
with:
175-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS
175+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJS
176176

177-
- name: Inflate target directories (3.2.2, rootJS)
177+
- name: Inflate target directories (3.3.0, rootJS)
178178
run: |
179179
tar xf targets.tar
180180
rm targets.tar
181181
182-
- name: Download target directories (3.2.2, rootJVM)
182+
- name: Download target directories (3.3.0, rootJVM)
183183
uses: actions/download-artifact@v3
184184
with:
185-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM
185+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJVM
186186

187-
- name: Inflate target directories (3.2.2, rootJVM)
187+
- name: Inflate target directories (3.3.0, rootJVM)
188188
run: |
189189
tar xf targets.tar
190190
rm targets.tar
191191
192-
- name: Download target directories (3.2.2, rootNative)
192+
- name: Download target directories (3.3.0, rootNative)
193193
uses: actions/download-artifact@v3
194194
with:
195-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative
195+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNative
196196

197-
- name: Inflate target directories (3.2.2, rootNative)
197+
- name: Inflate target directories (3.3.0, rootNative)
198198
run: |
199199
tar xf targets.tar
200200
rm targets.tar

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import com.typesafe.tools.mima.core._
22

33
Global / onChangedBuildSource := ReloadOnSourceChanges
44

5-
ThisBuild / tlBaseVersion := "3.7"
5+
ThisBuild / tlBaseVersion := "3.8"
66

77
ThisBuild / organization := "co.fs2"
88
ThisBuild / organizationName := "Functional Streams for Scala"
99
ThisBuild / startYear := Some(2013)
1010

1111
val NewScala = "2.13.10"
1212

13-
ThisBuild / crossScalaVersions := Seq("3.2.2", "2.12.17", NewScala)
13+
ThisBuild / crossScalaVersions := Seq("3.3.0", "2.12.17", NewScala)
1414
ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")
1515

1616
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest")
@@ -296,7 +296,7 @@ lazy val io = crossProject(JVMPlatform, JSPlatform, NativePlatform)
296296
.jvmSettings(
297297
Test / fork := true,
298298
libraryDependencies ++= Seq(
299-
"com.github.jnr" % "jnr-unixsocket" % "0.38.19" % Optional,
299+
"com.github.jnr" % "jnr-unixsocket" % "0.38.20" % Optional,
300300
"com.google.jimfs" % "jimfs" % "1.2" % Test
301301
)
302302
)

io/jvm-native/src/main/scala/fs2/io/net/SocketPlatform.scala

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,7 @@ private[net] trait SocketCompanionPlatform {
117117
null,
118118
new IntCompletionHandler(cb)
119119
)
120-
F.delay(Some(F.delay {
121-
ch.shutdownInput()
122-
()
123-
}))
120+
F.delay(Some(endOfInput.voidError))
124121
}
125122

126123
def write(bytes: Chunk[Byte]): F[Unit] = {
@@ -131,10 +128,7 @@ private[net] trait SocketCompanionPlatform {
131128
null,
132129
new IntCompletionHandler(cb)
133130
)
134-
F.delay(Some(F.delay {
135-
ch.shutdownOutput()
136-
()
137-
}))
131+
F.delay(Some(endOfOutput.voidError))
138132
}.flatMap { written =>
139133
if (written >= 0 && buff.remaining() > 0)
140134
go(buff)

io/jvm/src/test/scala/fs2/io/IoPlatformSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import java.util.concurrent.Executors
3939
class IoPlatformSuite extends Fs2Suite {
4040

4141
// This suite runs for a long time, this avoids timeouts in CI.
42-
override def munitIOTimeout: Duration = 1.minute
42+
override def munitIOTimeout: Duration = 2.minutes
4343

4444
group("readOutputStream") {
4545
test("writes data and terminates when `f` returns") {

project/build.properties

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

site/adopters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
Here's a (non-exhaustive) list of companies that use FS2 in production. Don't see yours? You can [add it in a PR!](https://github.com/functional-streams-for-scala/fs2/edit/main/README.md)
44

5-
* [Banno](https://banno.com/)
65
* [Chatroulette](https://about.chatroulette.com/)
76
* [Comcast](https://www.xfinity.com/)
87
* [CompStak](https://www.compstak.com)
@@ -13,6 +12,7 @@ Here's a (non-exhaustive) list of companies that use FS2 in production. Don't se
1312
* [HiFi](https://hi.fi/)
1413
* [Hireproof](https://hireproof.io/)
1514
* [ITV](https://itv.com/)
15+
* [Jack Henry](https://www.jackhenry.com)
1616
* [Kaluza](https://www.kaluza.com)
1717
* [OVO Energy](https://www.ovoenergy.com)
1818
* [Ocado Technology](https://www.ocadogroup.com/technology/technology-pioneers)

0 commit comments

Comments
 (0)