Skip to content

Commit 3d789d1

Browse files
Merge branch 'main' into update/scala-library-2.12.18
2 parents c0b8acc + 3831ed5 commit 3d789d1

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest, macos-latest]
31-
scala: [3.3.0, 2.12.17, 2.13.10]
31+
scala: [3.3.0, 2.12.17, 2.13.11]
3232
java: [temurin@17]
3333
project: [rootJS, rootJVM, rootNative]
3434
exclude:
@@ -106,7 +106,7 @@ jobs:
106106
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
107107

108108
- name: Scalafix tests
109-
if: matrix.scala == '2.13.10' && matrix.project == 'rootJVM'
109+
if: matrix.scala == '2.13.11' && matrix.project == 'rootJVM'
110110
run: |
111111
cd scalafix
112112
sbt testCI
@@ -229,32 +229,32 @@ jobs:
229229
tar xf targets.tar
230230
rm targets.tar
231231
232-
- name: Download target directories (2.13.10, rootJS)
232+
- name: Download target directories (2.13.11, rootJS)
233233
uses: actions/download-artifact@v3
234234
with:
235-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS
235+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJS
236236

237-
- name: Inflate target directories (2.13.10, rootJS)
237+
- name: Inflate target directories (2.13.11, rootJS)
238238
run: |
239239
tar xf targets.tar
240240
rm targets.tar
241241
242-
- name: Download target directories (2.13.10, rootJVM)
242+
- name: Download target directories (2.13.11, rootJVM)
243243
uses: actions/download-artifact@v3
244244
with:
245-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM
245+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJVM
246246

247-
- name: Inflate target directories (2.13.10, rootJVM)
247+
- name: Inflate target directories (2.13.11, rootJVM)
248248
run: |
249249
tar xf targets.tar
250250
rm targets.tar
251251
252-
- name: Download target directories (2.13.10, rootNative)
252+
- name: Download target directories (2.13.11, rootNative)
253253
uses: actions/download-artifact@v3
254254
with:
255-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative
255+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootNative
256256

257-
- name: Inflate target directories (2.13.10, rootNative)
257+
- name: Inflate target directories (2.13.11, rootNative)
258258
run: |
259259
tar xf targets.tar
260260
rm targets.tar

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ThisBuild / organization := "co.fs2"
88
ThisBuild / organizationName := "Functional Streams for Scala"
99
ThisBuild / startYear := Some(2013)
1010

11-
val NewScala = "2.13.10"
11+
val NewScala = "2.13.11"
1212

1313
ThisBuild / crossScalaVersions := Seq("3.3.0", "2.12.17", NewScala)
1414
ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")
@@ -308,7 +308,7 @@ lazy val io = crossProject(JVMPlatform, JSPlatform, NativePlatform)
308308
.nativeSettings(commonNativeSettings)
309309
.nativeSettings(
310310
libraryDependencies ++= Seq(
311-
"com.armanbilge" %%% "epollcat" % "0.1.4" % Test
311+
"com.armanbilge" %%% "epollcat" % "0.1.5" % Test
312312
),
313313
Test / nativeBrewFormulas += "s2n",
314314
Test / envVars ++= Map("S2N_DONT_MLOCK" -> "1")

0 commit comments

Comments
 (0)