Skip to content

jna 5.19.0 #86

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.

Sign up for GitHub

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

Merged
eed3si9n merged 3 commits into from
Jul 10, 2026
Merged

jna 5.19.0 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b11f78
ALL-UNNAMED
eed3si9n Jul 10, 2026
a452eec
fix: Fixes available
eed3si9n Jul 10, 2026
f9365c1
jna 5.19.0
eed3si9n Jul 10, 2026
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
9 changes: 7 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import scala.collection.mutable.ArrayBuffer
import scala.util.Try
import scala.sys.process._

val jnaVersion = "5.12.0"
val jnaVersion = "5.19.0"
val jna = "net.java.dev.jna" % "jna" % jnaVersion

val jnaPlatform = "net.java.dev.jna" % "jna-platform" % jnaVersion
Expand Down Expand Up @@ -105,13 +105,18 @@ buildWin32X86_64 / skip := {
}, _.isEmpty)
}
Test / fork := true
Test / javaOptions ++= {
import scala.util.Properties
if (Properties.isJavaAtLeast("11")) Seq("--enable-native-access=ALL-UNNAMED")
else Nil
}
Test / testGrouping := {
val tests = (Test / definedTests).value
tests
.groupBy(_.name)
.map {
case (name, tests) =>
val options = ForkOptions()
val options = (Test / forkOptions).value
new Tests.Group(name, tests, Tests.SubProcess(options))
}
.toSeq
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/org/scalasbt/ipcsocket/UnixDomainSocketLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,14 @@ public int available(int fd) throws NativeErrorException {
} else {
op = UnixDomainSocketLibrary.FIONREAD;
}
UnixDomainSocketLibrary.ioctl(fd, op, len);
final int r = UnixDomainSocketLibrary.ioctl(fd, op, len);
if (r != 0) {
if (pollRead(fd, 0)) {
return 1;
} else {
return 0;
}
}
return len.getValue();
} catch (final LastErrorException e) {
if (pollRead(fd, 0)) {
Expand Down