From 7729dd972f30fbbb1d0118c9ca0e074913a1e4df Mon Sep 17 00:00:00 2001 From: Thad House Date: Mon, 11 Dec 2017 11:48:39 -0800 Subject: [PATCH] Fixes JNI symbol check (#830) setErrorData symbol was missing. However, its been deprecated at the netcomm level for years, and wasn't exposed in wpilibj. And it would have been crashing since forever, so safe to remove. --- build.gradle | 2 +- wpilibj/build.gradle | 1 + wpilibj/src/main/java/edu/wpi/first/wpilibj/hal/HAL.java | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2a874a7eee..676e7bff48 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'gradle.plugin.edu.wpi.first:native-utils:1.5.0' + classpath 'gradle.plugin.edu.wpi.first:native-utils:1.5.1' } } diff --git a/wpilibj/build.gradle b/wpilibj/build.gradle index c952f2992c..080eb92989 100644 --- a/wpilibj/build.gradle +++ b/wpilibj/build.gradle @@ -12,6 +12,7 @@ apply plugin: 'edu.wpi.first.NativeUtils' apply plugin: 'java' apply plugin: 'net.ltgt.errorprone' apply plugin: 'pmd' +apply plugin: TestingModelBasePlugin configurations.errorprone { resolutionStrategy.force 'com.google.errorprone:error_prone_core:2.0.9' diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/hal/HAL.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/hal/HAL.java index aa668dab63..e676772920 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/hal/HAL.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/hal/HAL.java @@ -120,8 +120,6 @@ public class HAL extends JNIWrapper { public static native int getMatchInfo(MatchInfoData info); - public static native int setErrorData(String error); - public static native int sendError(boolean isError, int errorCode, boolean isLVCode, String details, String location, String callStack, boolean printMsg);