Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup dependencies (#201)

Browse Source 
* We don't need to shadow in `lombok` itself. Gradle must be upgraded to at least 4.6 to support `annotationProcessor`, which is a version that still supports Java 7.
* `args4j-maven-plugin` is intended to use as a maven plugin.
* The requirement for `jaxb-api` was removed in 81cba7d58c0ce8a334204700dca669f2ad8e16ff
* We are only using `simple-xml`, don't need the whole `retrofit`+`okhttp`+`okio` chain.
* Resolve deprecation warnings in JNA code.
This commit is contained in:
Andy Li
2020-04-26 21:29:48 +08:00
committed by GitHub
parent 87533a1262
commit d529da172a
10 changed files with 71 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java
View File

@@ -22,7 +22,7 @@ public class Nvidia implements GPULister {
}
CUDA cudalib = null;
try {
cudalib = (CUDA) Native.loadLibrary(path, CUDA.class);
cudalib = (CUDA) Native.load(path, CUDA.class);
}
catch (java.lang.UnsatisfiedLinkError e) {
return null;

2
src/com/sheepit/client/hardware/gpu/opencl/OpenCL.java
View File

@@ -40,7 +40,7 @@ public class OpenCL implements GPULister {
String path = "OpenCL";
try {
lib = (OpenCLLib) Native.loadLibrary(path, OpenCLLib.class);
lib = (OpenCLLib) Native.load(path, OpenCLLib.class);
}
catch (java.lang.UnsatisfiedLinkError e) {
System.out.println("OpenCL::getGpus failed(A) to load OpenCL lib (path: " + path + ")");

2
src/com/sheepit/client/os/Windows.java
View File

@@ -127,7 +127,7 @@ public class Windows extends OS {
// disable a popup because the renderer might crash (seg fault)
Kernel32Lib kernel32lib = null;
try {
kernel32lib = (Kernel32Lib) Native.loadLibrary(Kernel32Lib.path, Kernel32Lib.class);
kernel32lib = (Kernel32Lib) Native.load(Kernel32Lib.path, Kernel32Lib.class);
kernel32lib.SetErrorMode(Kernel32Lib.SEM_NOGPFAULTERRORBOX);
}
catch (java.lang.UnsatisfiedLinkError e) {

4
src/com/sheepit/client/os/windows/Kernel32Lib.java
View File

@@ -152,8 +152,8 @@ public interface Kernel32Lib extends Library {
public char[] szExeFile = new char[WinDef.MAX_PATH];
@Override
protected List getFieldOrder() {
return Arrays.asList(new String[] { "dwSize", "cntUsage", "th32ProcessID", "th32DefaultHeapID", "th32ModuleID", "cntThreads", "th32ParentProcessID", "pcPriClassBase", "dwFlags", "szExeFile" });
protected List<String> getFieldOrder() {
return Arrays.asList("dwSize", "cntUsage", "th32ProcessID", "th32DefaultHeapID", "th32ModuleID", "cntThreads", "th32ParentProcessID", "pcPriClassBase", "dwFlags", "szExeFile");
}
}

2
src/com/sheepit/client/os/windows/WinProcess.java
View File

@@ -49,7 +49,7 @@ public class WinProcess {
this.pid = -1;
this.kernel32lib = null;
try {
this.kernel32lib = (Kernel32Lib) Native.loadLibrary(Kernel32Lib.path, Kernel32Lib.class);
this.kernel32lib = (Kernel32Lib) Native.load(Kernel32Lib.path, Kernel32Lib.class);
}
catch (java.lang.UnsatisfiedLinkError e) {
System.out.println("WinProcess::construct " + e);