From ba17f7bdf4bc424138569baf17e424c4904eed48 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 08:07:59 +0000 Subject: [PATCH 1/3] Update scala3-library, ... to 3.3.4 in series/3.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 371d5cbcab..941d29e285 100644 --- a/build.sbt +++ b/build.sbt @@ -114,7 +114,7 @@ val MacOS = "macos-14" val Scala212 = "2.12.20" val Scala213 = "2.13.15" -val Scala3 = "3.3.3" +val Scala3 = "3.3.4" ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213) ThisBuild / githubWorkflowScalaVersions := crossScalaVersions.value From d73ed805341b6ebd797298225686a408a7e61a3d Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 08:08:20 +0000 Subject: [PATCH 2/3] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fda1ed4d66..3e27eb1ca3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-14] - scala: [3.3.3, 2.12.20, 2.13.15] + scala: [3.3.4, 2.12.20, 2.13.15] java: - temurin@8 - temurin@11 @@ -37,9 +37,9 @@ jobs: - graalvm@17 ci: [ciJVM, ciNative, ciJS, ciFirefox, ciChrome] exclude: - - scala: 3.3.3 + - scala: 3.3.4 java: temurin@11 - - scala: 3.3.3 + - scala: 3.3.4 java: temurin@21 - scala: 2.12.20 java: temurin@11 @@ -50,10 +50,10 @@ jobs: - scala: 2.12.20 java: graalvm@17 - os: windows-latest - scala: 3.3.3 + scala: 3.3.4 ci: ciJVM - os: macos-14 - scala: 3.3.3 + scala: 3.3.4 ci: ciJVM - os: windows-latest scala: 2.12.20 @@ -64,9 +64,9 @@ jobs: - os: macos-14 java: temurin@8 - ci: ciFirefox - scala: 3.3.3 + scala: 3.3.4 - ci: ciChrome - scala: 3.3.3 + scala: 3.3.4 - ci: ciFirefox scala: 2.12.20 - ci: ciChrome @@ -239,24 +239,24 @@ jobs: run: sbt githubWorkflowCheck - name: Check that scalafix has been run on JVM - if: matrix.ci == 'ciJVM' && matrix.scala != '3.3.3' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.ci == 'ciJVM' && matrix.scala != '3.3.4' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' shell: bash run: sbt '++ ${{ matrix.scala }}' 'rootJVM/scalafixAll --check' - name: Check that scalafix has been run on JS - if: matrix.ci == 'ciJS' && matrix.scala != '3.3.3' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.ci == 'ciJS' && matrix.scala != '3.3.4' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' shell: bash run: sbt '++ ${{ matrix.scala }}' 'rootJS/scalafixAll --check' - name: Check that scalafix has been run on Native - if: matrix.ci == 'ciNative' && matrix.scala != '3.3.3' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.ci == 'ciNative' && matrix.scala != '3.3.4' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' shell: bash run: sbt '++ ${{ matrix.scala }}' 'rootNative/scalafixAll --check' - shell: bash run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}' - - if: (matrix.scala == '2.13.15' || matrix.scala == '3.3.3') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17' + - if: (matrix.scala == '2.13.15' || matrix.scala == '3.3.4') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17' shell: bash run: sbt '++ ${{ matrix.scala }}' docs/mdoc @@ -392,32 +392,32 @@ jobs: if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (3.3.3, ciJVM) + - name: Download target directories (3.3.4, ciJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.3-ciJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.4-ciJVM - - name: Inflate target directories (3.3.3, ciJVM) + - name: Inflate target directories (3.3.4, ciJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.3, ciNative) + - name: Download target directories (3.3.4, ciNative) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.3-ciNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.4-ciNative - - name: Inflate target directories (3.3.3, ciNative) + - name: Inflate target directories (3.3.4, ciNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.3, ciJS) + - name: Download target directories (3.3.4, ciJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.3-ciJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.4-ciJS - - name: Inflate target directories (3.3.3, ciJS) + - name: Inflate target directories (3.3.4, ciJS) run: | tar xf targets.tar rm targets.tar From 2c7ef318d203f59048ad84f39938bcde17648e7e Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 30 Sep 2024 19:44:42 +0000 Subject: [PATCH 3/3] Fix Native compile --- core/native/src/main/scala/cats/effect/Signal.scala | 2 +- core/native/src/main/scala/cats/effect/unsafe/EpollSystem.scala | 2 +- .../native/src/main/scala/cats/effect/unsafe/KqueueSystem.scala | 2 +- .../src/test/scala/cats/effect/FileDescriptorPollerSpec.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/native/src/main/scala/cats/effect/Signal.scala b/core/native/src/main/scala/cats/effect/Signal.scala index 6d678211df..9a0d9bc2c4 100644 --- a/core/native/src/main/scala/cats/effect/Signal.scala +++ b/core/native/src/main/scala/cats/effect/Signal.scala @@ -34,7 +34,7 @@ import java.io.IOException private object Signal { private[this] def mkPipe() = if (isLinux || isMac) { - val fd = stackalloc[CInt](2) + val fd = stackalloc[CInt](2.toULong) if (pipe(fd) != 0) throw new IOException(fromCString(strerror(errno))) diff --git a/core/native/src/main/scala/cats/effect/unsafe/EpollSystem.scala b/core/native/src/main/scala/cats/effect/unsafe/EpollSystem.scala index 9874edb58e..4e8dfd28d0 100644 --- a/core/native/src/main/scala/cats/effect/unsafe/EpollSystem.scala +++ b/core/native/src/main/scala/cats/effect/unsafe/EpollSystem.scala @@ -185,7 +185,7 @@ object EpollSystem extends PollingSystem { private[EpollSystem] def poll(timeout: Long): Boolean = { - val events = stackalloc[epoll_event](MaxEvents.toLong) + val events = stackalloc[epoll_event](MaxEvents.toULong) var polled = false @tailrec diff --git a/core/native/src/main/scala/cats/effect/unsafe/KqueueSystem.scala b/core/native/src/main/scala/cats/effect/unsafe/KqueueSystem.scala index 3a26a4eb6d..0e7aae2395 100644 --- a/core/native/src/main/scala/cats/effect/unsafe/KqueueSystem.scala +++ b/core/native/src/main/scala/cats/effect/unsafe/KqueueSystem.scala @@ -170,7 +170,7 @@ object KqueueSystem extends PollingSystem { private[KqueueSystem] def poll(timeout: Long): Boolean = { - val eventlist = stackalloc[kevent64_s](MaxEvents.toLong) + val eventlist = stackalloc[kevent64_s](MaxEvents.toULong) var polled = false @tailrec diff --git a/tests/native/src/test/scala/cats/effect/FileDescriptorPollerSpec.scala b/tests/native/src/test/scala/cats/effect/FileDescriptorPollerSpec.scala index 543d71b0a6..879f122fdc 100644 --- a/tests/native/src/test/scala/cats/effect/FileDescriptorPollerSpec.scala +++ b/tests/native/src/test/scala/cats/effect/FileDescriptorPollerSpec.scala @@ -69,7 +69,7 @@ class FileDescriptorPollerSpec extends BaseSpec { Resource .make { IO { - val fd = stackalloc[CInt](2) + val fd = stackalloc[CInt](2.toULong) if (unistd.pipe(fd) != 0) throw new IOException(fromCString(strerror(errno))) (fd(0), fd(1))