Merge pull request #407 from snuyanzin/JNA_UPGRADE

Upgrade jna to 5.3.1
jline · Jul 4, 2019 · 0376b96 · 0376b96
2 parents 0fd273f + 740a395
commit 0376b96
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <jna.version>4.2.2</jna.version>
+        <jna.version>5.3.1</jna.version>
         <jansi.version>1.18</jansi.version>
         <juniversalchardet.version>1.0.3</juniversalchardet.version>
         <sshd.version>2.1.0</sshd.version>

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/FreeBsdNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/FreeBsdNativePty.java
@@ -26,13 +26,13 @@
 
 public class FreeBsdNativePty extends JnaNativePty {
 
-    private static final CLibrary C_LIBRARY = (CLibrary) Native.loadLibrary(Platform.C_LIBRARY_NAME, CLibrary.class);
+    private static final CLibrary C_LIBRARY = Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
 
     public interface UtilLibrary extends com.sun.jna.Library {
 
         void openpty(int[] master, int[] slave, byte[] name, CLibrary.termios t, CLibrary.winsize s) throws LastErrorException;
 
-        UtilLibrary INSTANCE = (UtilLibrary) Native.loadLibrary("util", UtilLibrary.class);
+        UtilLibrary INSTANCE = Native.load("util", UtilLibrary.class);
     }
 
     public static FreeBsdNativePty current() throws IOException {

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/LinuxNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/LinuxNativePty.java
@@ -26,13 +26,13 @@
 
 public class LinuxNativePty extends JnaNativePty {
 
-    private static final CLibrary C_LIBRARY = (CLibrary) Native.loadLibrary(Platform.C_LIBRARY_NAME, CLibrary.class);
+    private static final CLibrary C_LIBRARY = Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
 
     public interface UtilLibrary extends com.sun.jna.Library {
 
         void openpty(int[] master, int[] slave, byte[] name, CLibrary.termios t, CLibrary.winsize s) throws LastErrorException;
 
-        UtilLibrary INSTANCE = (UtilLibrary) Native.loadLibrary("util", UtilLibrary.class);
+        UtilLibrary INSTANCE = Native.load("util", UtilLibrary.class);
     }
 
     public static LinuxNativePty current() throws IOException {

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/OsXNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/OsXNativePty.java
@@ -26,7 +26,7 @@
 
 public class OsXNativePty extends JnaNativePty {
 
-    private static final CLibrary C_LIBRARY = (CLibrary) Native.loadLibrary(Platform.C_LIBRARY_NAME, CLibrary.class);
+    private static final CLibrary C_LIBRARY = Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
 
     public static OsXNativePty current() throws IOException {
         int slave = 0;

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/SolarisNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/SolarisNativePty.java
@@ -25,7 +25,7 @@
 
 public class SolarisNativePty extends JnaNativePty {
 
-    private static final CLibrary C_LIBRARY = (CLibrary) Native.loadLibrary(Platform.C_LIBRARY_NAME, CLibrary.class);
+    private static final CLibrary C_LIBRARY = Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
 
     public static SolarisNativePty current() throws IOException {
         int slave = 0;

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/Kernel32.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/Kernel32.java
@@ -19,7 +19,7 @@
 
 interface Kernel32 extends StdCallLibrary {
 
-    Kernel32 INSTANCE = (Kernel32) Native.loadLibrary("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
+    Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
 
     Pointer INVALID_HANDLE_VALUE = Pointer.createConstant(-1L);