Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scala3-library, ... to 3.3.4 in series/3.x #4145

Merged
merged 3 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/native/src/main/scala/cats/effect/Signal.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Loading