Merge pull request #80 from eed3si9n/bport/actions

[1.x] backport CI changes + fix

Author: eed3si9n

.github/workflows/ci.yml

@@ -7,15 +7,22 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          # Changing this will change glibc
+          - os: ubuntu-22.04
             java: 8
             jobtype: 1
-          - os: macos-12
+          - os: ubuntu-24.04
+            java: 25
+            jobtype: 2
+          - os: macos-15-intel
             java: 8
             jobtype: 1
-          - os: macos-14
+          - os: macos-15
             java: 8
             jobtype: 1
+          - os: macos-15
+            java: 25
+            jobtype: 1
           - os: windows-latest
             java: 8
             jobtype: 1
@@ -25,17 +32,17 @@ jobs:
       JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: "${{ matrix.java }}"
           cache: sbt
       - uses: sbt/setup-sbt@v1
       - name: Set up MinGW
         if: ${{ runner.os == 'Linux' }}
-        uses: egor-tensin/setup-mingw@v2
+        uses: egor-tensin/setup-mingw@v3
         with:
           platform: x64
       - name: Set up gcc-aarch64-linux-gnu
@@ -56,17 +63,17 @@ jobs:
         shell: bash
         run: sbt "buildNativeArtifacts; test"
       - name: Archive native artifacts (Linux)
-        if: ${{ runner.os == 'Linux' }}
-        uses: actions/upload-artifact@v4
+        if: ${{ runner.os == 'Linux' && matrix.jobtype == '1' }}
+        uses: actions/upload-artifact@v7
         with:
           name: dist-${{ runner.os }}
           path: |
             src/main/resources/linux/x86_64/libsbtipcsocket.so
             src/main/resources/linux/aarch64/libsbtipcsocket.so
             src/main/resources/win32/x86_64/sbtipcsocket.dll
       - name: Archive native artifacts (macOS)
-        if: ${{ matrix.os == 'macos-12' }}
-        uses: actions/upload-artifact@v4
+        if: ${{ matrix.os == 'macos-15-intel' }}
+        uses: actions/upload-artifact@v7
         with:
           name: dist-${{ runner.os }}
           path: src/main/resources/darwin/x86_64/libsbtipcsocket.dylib

.gitignore

@@ -12,4 +12,4 @@
 
 # Metals
 .metals
-
+metals.sbt

build.sbt

@@ -61,11 +61,12 @@ inThisBuild(
     ),
     isSnapshot := (isSnapshot or version(_ endsWith "-SNAPSHOT")).value,
     description := "IPC: Unix Domain Socket and Windows Named Pipes for Java",
-    licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
+    licenses := Seq(License.Apache2),
     publishTo := {
-      val nexus = "https://oss.sonatype.org/"
-      if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots")
-      else Some("releases" at nexus + "service/local/staging/deploy/maven2")
+      val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
+      val v = (ThisBuild / version).value
+      if (v.endsWith("SNAPSHOT")) Some("central-snapshots" at centralSnapshots)
+      else localStaging.value
     },
     nativeArch := "x86_64",
     nativeCompiler := "gcc",

jni/org_scalasbt_ipcsocket_JNIUnixDomainSocketLibraryProvider.c

@@ -89,7 +89,9 @@ Java_org_scalasbt_ipcsocket_JNIUnixDomainSocketLibraryProvider_readNative(
   errno = 0;
   jbyte *bytes = malloc(len);
   int bytes_read = read(fd, bytes, len);
-  (*env)->SetByteArrayRegion(env, buffer, offset, bytes_read, bytes);
+  if (bytes_read > 0) {
+    (*env)->SetByteArrayRegion(env, buffer, offset, bytes_read, bytes);
+  }
   free(bytes);
   THROW_ON_ERROR(bytes_read);
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.11.7

project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
+addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
 addSbtPlugin("com.swoval" % "sbt-source-format" % "0.3.1")

src/main/java/org/scalasbt/ipcsocket/UnixDomainSocket.java

@@ -122,7 +122,7 @@ private class UnixDomainSocketInputStream extends InputStream {
     public int read() throws IOException {
       byte[] buf = new byte[1];
       int result;
-      if (doRead(buf, 0, 1) == 0) {
+      if (doRead(buf, 0, 1) <= 0) {
         result = -1;
       } else {
         // Make sure to & with 0xFF to avoid sign extension