Make things compatible with 2019.

Author: James Hagborg

build.gradle

@@ -1,35 +1,32 @@
 import org.gradle.plugins.ide.eclipse.model.AccessRule
 
 plugins {
-  id "fr.brouillard.oss.gradle.jgitver" version "0.2.0"
+    id 'com.google.osdetector' version '1.4.0'
+    id 'fr.brouillard.oss.gradle.jgitver' version '0.6.1'
+    id 'java'
 }
 
-apply plugin: 'java'
-apply plugin: 'eclipse'
-
 jgitver {
   mavenLike = true
 }
 
 repositories {
-        mavenCentral()
-        maven {
-            url 'http://first.wpi.edu/FRC/roborio/maven/release'
-        }
+    mavenCentral()
+    maven {
+        url 'http://first.wpi.edu/FRC/roborio/maven/release'
     }
-
-dependencies {
-    compile group: 'edu.wpi.first.shuffleboard', name: 'api', version: '1.2.+'
-    compile group: 'edu.wpi.first.shuffleboard.plugin', name: 'networktables', version: '1.2.+' 
 }
 
-eclipse {
-    classpath {
-        file {
-            whenMerged {
-                def jre = entries.find { it.path.contains 'org.eclipse.jdt.launching.JRE_CONTAINER' }
-                jre.accessRules.add(new AccessRule('0', 'javafx/**'))
-            }
-        }
-    }
+def os_mapping = ['linux': 'linux', 'osx': 'mac', 'windows': 'win']
+def os_classifier = os_mapping[osdetector.os]
+if (os_classifier == null) {
+    throw new RuntimeException("Unsupported OS: ${osdetector.os}".toString())
 }
+
+dependencies {
+    compile "org.openjfx:javafx-base:11.0.1:$os_classifier"
+    compile "org.openjfx:javafx-graphics:11.0.1:$os_classifier"
+    compile "org.openjfx:javafx-controls:11.0.1:$os_classifier"
+    compile 'edu.wpi.first.shuffleboard:api:2019.1.1-beta-2'
+    compile 'edu.wpi.first.shuffleboard.plugin:networktables:2019.1.1-beta-2'
+}

src/main/java/org/hyperonline/autoviewer/AutoViewerPlugin.java

@@ -4,7 +4,6 @@
 import java.util.Map;
 
 import org.hyperonline.autoviewer.widget.AutonomousInfoWidget;
-import org.hyperonline.autoviewer.widget.AutonomousRoutineWidget;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -18,16 +17,15 @@
 
 @Description(group = "org.hyperonline",
     name = "AutoViewer",
-    version = "0.1.0", 
+    version = "0.2.0", 
     summary = "Select autonomous modes and set preferences"
 )
-@Requires(group = "edu.wpi.first.shuffleboard", name = "NetworkTables", minVersion = "1.0.0")
+@Requires(group = "edu.wpi.first.shuffleboard", name = "NetworkTables", minVersion = "2.0.0")
 public class AutoViewerPlugin extends Plugin {
     @SuppressWarnings("rawtypes")
     @Override
     public List<DataType> getDataTypes() {
         return ImmutableList.of(
-                //AutonomousRoutineType.Instance,
                 AutonomousInfoType.Instance);
     }
 
@@ -36,15 +34,13 @@ public List<DataType> getDataTypes() {
     @Override
     public List<ComponentType> getComponents() {
         return ImmutableList.of(
-                //WidgetType.forAnnotatedWidget(AutonomousRoutineWidget.class),
                 WidgetType.forAnnotatedWidget(AutonomousInfoWidget.class));
     }
 
     @SuppressWarnings("rawtypes")
     @Override
     public Map<DataType, ComponentType> getDefaultComponents() {
         return ImmutableMap.<DataType, ComponentType>builder()
-                //.put(AutonomousRoutineType.Instance, WidgetType.forAnnotatedWidget(AutonomousRoutineWidget.class))
                 .put(AutonomousInfoType.Instance, WidgetType.forAnnotatedWidget(AutonomousInfoWidget.class))
                 .build();
     }

src/main/java/org/hyperonline/autoviewer/widget/AutonomousInfoWidget.java

@@ -12,11 +12,11 @@
 
 import edu.wpi.first.networktables.NetworkTableEntry;
 import edu.wpi.first.shuffleboard.api.sources.DataSource;
-import edu.wpi.first.shuffleboard.api.util.NetworkTableUtils;
 import edu.wpi.first.shuffleboard.api.widget.Description;
 import edu.wpi.first.shuffleboard.api.widget.ParametrizedController;
 import edu.wpi.first.shuffleboard.api.widget.SimpleAnnotatedWidget;
 import edu.wpi.first.shuffleboard.plugin.networktables.sources.NetworkTableSource;
+import edu.wpi.first.shuffleboard.plugin.networktables.util.NetworkTableUtils;
 import javafx.fxml.FXML;
 import javafx.geometry.Orientation;
 import javafx.scene.control.ChoiceBox;
@@ -34,7 +34,7 @@
 public class AutonomousInfoWidget extends SimpleAnnotatedWidget<AutonomousInfo> {
 
     public static final String PREFERENCES_LOCATION = "Preferences/$auto_preferences";
-    public static final String SEPERATOR = "/";
+    public static final String SEPARATOR = "/";
 
     @FXML
     private BorderPane root;
@@ -248,7 +248,7 @@ private void addUIEntry(int rowNum, int colNum, String prefName, DataSource<Doub
     }
 
     private DataSource<Double> getDataSource(String routine, String pref) {
-        String path = PREFERENCES_LOCATION + SEPERATOR + routine + SEPERATOR + pref;
+        String path = PREFERENCES_LOCATION + SEPARATOR + routine + SEPARATOR + pref;
 
         NetworkTableEntry entry = NetworkTableUtils.rootTable.getEntry(path);
         entry.setDefaultDouble(0.0);