Update Gradle to v3.0 (#666)

AustinShalit · JLLeitschuh · commit a7008925966f · 2016-08-25T12:35:25.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ before_install:
 
 # Only do an assemble when we aren't building a pull request
 install:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew :ui:jfxNative --stacktrace || ./gradlew --stacktrace '
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew jfxNative --no-daemon --stacktrace || ./gradlew --stacktrace '
 
 script:
   - ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ install:
   - choco install -y InnoSetup
 
 build_script:
-  - gradlew.bat :ui:jfxNative --stacktrace
+  - gradlew.bat jfxNative --no-daemon --stacktrace
 
 # to run your custom scripts instead of automatic tests
 test_script:
diff --git a/build.gradle b/build.gradle
@@ -464,5 +464,5 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.14.1'
+    gradleVersion = '3.0'
 }
diff --git a/core/src/test/java/edu/wpi/grip/core/http/NoLogger.java b/core/src/test/java/edu/wpi/grip/core/http/NoLogger.java
@@ -5,7 +5,7 @@
 /**
  * Jetty logger implementation that ignores all logging calls.
  */
-@SuppressWarnings("PMD.UncommentedEmptyMethod")
+@SuppressWarnings("PMD.UncommentedEmptyMethodBody")
 public class NoLogger implements Logger {
 
   @Override
diff --git a/core/src/test/java/edu/wpi/grip/core/operations/OperationsFactory.java b/core/src/test/java/edu/wpi/grip/core/operations/OperationsFactory.java
@@ -51,19 +51,19 @@ public MockROSMessagePublisher(C converter) {
     }
 
     @Override
-    @SuppressWarnings("PMD.UncommentedEmptyMethod")
+    @SuppressWarnings("PMD.UncommentedEmptyMethodBody")
     public void publish(ROSMessagePublisher.Converter publish) {
 
     }
 
     @Override
-    @SuppressWarnings("PMD.UncommentedEmptyMethod")
+    @SuppressWarnings("PMD.UncommentedEmptyMethodBody")
     protected void publishNameChanged(Optional<String> oldName, String newName) {
 
     }
 
     @Override
-    @SuppressWarnings("PMD.UncommentedEmptyMethod")
+    @SuppressWarnings("PMD.UncommentedEmptyMethodBody")
     public void close() {
 
     }
diff --git a/core/src/test/java/edu/wpi/grip/core/operations/network/MockMapNetworkPublisher.java b/core/src/test/java/edu/wpi/grip/core/operations/network/MockMapNetworkPublisher.java
@@ -5,7 +5,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-@SuppressWarnings("PMD.UncommentedEmptyMethod")
+@SuppressWarnings("PMD.UncommentedEmptyMethodBody")
 public class MockMapNetworkPublisher<T> extends MapNetworkPublisher<T> implements
     MapNetworkPublisherFactory {
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jul 24 01:01:23 PDT 2016
+#Mon Aug 22 07:45:14 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/pmd-ruleset.xml b/pmd-ruleset.xml
@@ -3,9 +3,7 @@
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
-    <rule ref="rulesets/java/basic.xml">
-        <exclude name="UselessParentheses" />
-    </rule>
+    <rule ref="rulesets/java/basic.xml" />
     <rule ref="rulesets/java/braces.xml" />
     <rule ref="rulesets/java/design.xml">
         <exclude name="AccessorClassGeneration" />
diff --git a/ui/src/main/java/edu/wpi/grip/ui/util/ControllerMap.java b/ui/src/main/java/edu/wpi/grip/ui/util/ControllerMap.java
@@ -160,12 +160,13 @@ public C getWithNode(N node) {
    * @param controller The controller to use as a lookup key for the move
    * @param distance   The distance to move the node. 0 means no movement.
    */
+  @SuppressWarnings("PMD.CompareObjectsWithEquals")
   public void moveByDistance(C controller, int distance) {
     checkNotNull(controller, "Controller can not be null");
-    final N node = checkNotNull(controllerNodeMap.get(controller));
     if (distance == 0) {
       return;
     }
+    final N node = checkNotNull(controllerNodeMap.get(controller));
     final int oldIndex = nodesList.indexOf(node);
     final int newIndex = Math.min(Math.max(oldIndex + distance, 0), nodesList.size() - 1);
     if (oldIndex != newIndex) {

Original file line number	Diff line number	Diff line change
`@@ -464,5 +464,5 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`task wrapper(type: Wrapper) {`
`467`		`- gradleVersion = '2.14.1'`
	`467`	`+ gradleVersion = '3.0'`
`468`	`468`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,19 +51,19 @@ public MockROSMessagePublisher(C converter) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
`54`		`- @SuppressWarnings("PMD.UncommentedEmptyMethod")`
	`54`	`+ @SuppressWarnings("PMD.UncommentedEmptyMethodBody")`
`55`	`55`	`public void publish(ROSMessagePublisher.Converter publish) {`
`56`	`56`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`60`		`- @SuppressWarnings("PMD.UncommentedEmptyMethod")`
	`60`	`+ @SuppressWarnings("PMD.UncommentedEmptyMethodBody")`
`61`	`61`	`protected void publishNameChanged(Optional<String> oldName, String newName) {`
`62`	`62`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- @SuppressWarnings("PMD.UncommentedEmptyMethod")`
	`66`	`+ @SuppressWarnings("PMD.UncommentedEmptyMethodBody")`
`67`	`67`	`public void close() {`
`68`	`68`
`69`	`69`	`}`