Merge pull request #290 from eed3si9n/wip/bumpjna

[1.3.x] JNA 5.5.0
sbt · Mar 30, 2020 · 79d4fad · 79d4fad
2 parents f48f2b7 + c812dfd
commit 79d4fad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/io/src/main/scala/sbt/internal/io/Milli.scala b/io/src/main/scala/sbt/internal/io/Milli.scala
@@ -75,15 +75,20 @@ private abstract class MilliNative[Native] extends Milli {
   protected def toNative(mtime: Long): Native // convert milliseconds to native time
 }
 
-private trait PosixBase {
+/**
+ * FFI for standard C library.
+ */
+private sealed trait PosixBase extends Library {
+  /** http://www.cplusplus.com/reference/cstring/strerror/ */
   def strerror(errnum: Int): String
 }
+
 private abstract class MilliPosixBase[Interface <: PosixBase: ClassTag, Native]
     extends MilliNative[Native] {
   private val options = scala.collection.Map[String, Object]().asJava
   private final val ENOENT = 2
   protected val libc: Interface =
-    (JNANative.loadLibrary(
+    (JNANative.load(
       Platform.C_LIBRARY_NAME,
       classTag[Interface].runtimeClass.asInstanceOf[Class[Interface]],
       options

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,8 +9,8 @@ object Dependencies {
 
   val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
   val scalatest = "org.scalatest" %% "scalatest" % "3.0.8"
-  val jna = "net.java.dev.jna" % "jna" % "4.5.0"
-  val jnaPlatform = "net.java.dev.jna" % "jna-platform" % "4.5.0"
+  val jna = "net.java.dev.jna" % "jna" % "5.5.0"
+  val jnaPlatform = "net.java.dev.jna" % "jna-platform" % "5.5.0"
   val swovalFiles = "com.swoval" % "file-tree-views" % "2.1.3"
   def nightlyVersion: Option[String] = sys.props.get("sbt.build.version")
 }