From a7008925966fc8c296875a215b7dfdd14b805309 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Thu, 25 Aug 2016 12:35:25 -0400 Subject: [PATCH] Update Gradle to v3.0 (#666) --- .travis.yml | 2 +- appveyor.yml | 2 +- build.gradle | 2 +- .../java/edu/wpi/grip/core/http/NoLogger.java | 2 +- .../core/operations/OperationsFactory.java | 6 +++--- .../network/MockMapNetworkPublisher.java | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 53319 -> 52818 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 5 +++++ gradlew.bat | 6 ------ pmd-ruleset.xml | 4 +--- .../edu/wpi/grip/ui/util/ControllerMap.java | 3 ++- 12 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd20fe36c8..d95fdecb1a 100644 --- 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 index b493a1eb53..719e92a281 100644 --- 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 index f3b39b749d..fc9e5a0a48 100644 --- 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 index c7f3a4e2cc..33610c5009 100644 --- 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 index 21c4e83efe..95aed4420c 100644 --- 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 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 index a8e71df283..493b45e9ee 100644 --- 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 extends MapNetworkPublisher implements MapNetworkPublisherFactory { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d3b83982b9b1bccad955349d702be9b884c6e049..deedc7fa5e6310eac3148a7dd0b1f069b07364cb 100644 GIT binary patch delta 8717 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 T5fE^^9YQwBgGBSE@B{t_@ryu= diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e5032f0cd4..32f5593c26 100644 --- 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 index 27309d9231..9aa616c273 100755 --- a/gradlew +++ b/gradlew @@ -161,4 +161,9 @@ function splitJvmOpts() { eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then + cd "$(dirname "$0")" +fi + exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index f6d5974e72..e95643d6a2 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -49,7 +49,6 @@ goto fail @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/pmd-ruleset.xml b/pmd-ruleset.xml index 75adcfd33f..3a8ffb335d 100644 --- 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"> - - - + 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 index 51171ae06b..0f93082ca5 100644 --- 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) {