Update to Java 11 by SamCarlberg · Pull Request #932 · WPIRoboticsProjects/GRIP

SamCarlberg · 2019-04-02T23:19:35Z

Since the native packager tool was removed in Java 11, building native installers requires JDK 13 with a jpackage tool to be installed. Builds can be downloaded here for 64-bit Windows, Mac, and Linux. No win32 build is yet available.

Updates PMD, since older versions cannot run on Java 11. Most of the changes from this PR are due to new PMD rules.

Errorprone and spotbugs are disabled due to problems with Java 11

Grgit has been removed and replaced with a manual call to git describe --tags to get the version number.

UI tests are disabled due to TestFX not working on Java 11 when headless, and is bugged even when not headless (some tests require manual input).

Native installers can be created with ./gradlew :ui:jpackage. Generates a .exe for Windows, .dmg for Mac, and .deb for Linux in ui/build/installer/. The location of the JDK install can be specified with the property jdk13, eg ./gradlew :ui:jpackage -Pjdk13=/path/to/jdk13/home

File associations are available on Windows (so opening a .grip file will launch GRIP), but are not yet working for Mac or Linux. Updates to the jpackage tool will hopefully let us add that functionality further down the line.

Closes #890

jpackage requires a version of JDK13 installed with jpackage from https://jdk.java.net/jpackage/ and passed with -Pjdk13=/path/to/jdk-13 Still needs testing on Linux and Mac Remove Grgit Update PMD to 6.7.0 for Java 11 support Disable spotbugs and errorprone Disable UI tests, since they no longer work when headless and are flaky otherwise

Bump supported source version to 11

Instead of letting jpackage create the image, which would result in a Java 13 runtime

Double-click on foo.grip to open it in GRIP

Add file association support for windows

build.gradle.kts

JLLeitschuh · 2019-04-03T17:27:24Z

buildSrc/src/main/kotlin/JpackageExec.kt

+ */
+open class JpackageExec : DefaultTask() {
+
+    private val objectFactory = project.objects


Annotate as @Internal

Since the property is private, shouldn't that be unnecessary? There's no public accessor method like there are on no-modifier (public) properties.

JLLeitschuh · 2019-04-03T17:28:20Z

buildSrc/src/main/kotlin/JpackageExec.kt

+            fileAssociations.ifPresent { propsFile ->
+                args.addAll("--file-associations", propsFile.asFile.absolutePath)
+            }
+            args.addAll("--installer-type", installerType.get())


Consider extracting all of this to a private function?

All of what?

The arg creation.

buildSrc/src/main/kotlin/PlatformMapper.kt

core/src/main/java/edu/wpi/grip/core/operations/composite/PublishVideoOperation.java

JLLeitschuh · 2019-04-03T17:40:50Z

Is there any way to preserve running the UI tests with Travis on JDK 8 if we make it so the build can compile on both platforms?

SamCarlberg · 2019-04-04T19:41:19Z

Running UI tests on Java 8 would probably be possible - just don't add the JavaFX deps and use the appropriate versions of controlsfx and testfx. I'll have to do some digging

Several new false positives have popped up, though

JLLeitschuh · 2019-04-04T20:19:03Z

Running UI tests on Java 8 would probably be possible - just don't add the JavaFX deps and use the appropriate versions of controlsfx and testfx. I'll have to do some digging

I believe that preserving UI tests is worth the extra overhead.

Without them, we lose a significant percentage of our test coverage.

Update travis and appveyor to only run checks, not do native builds

codecov-io · 2019-04-04T21:37:40Z

Codecov Report

❗ No coverage uploaded for pull request base (master@34afc3d). Click here to learn what that means.
The diff coverage is 44.56%.

@@            Coverage Diff            @@
##             master     #932   +/-   ##
=========================================
  Coverage          ?   52.75%           
  Complexity        ?        1           
=========================================
  Files             ?      327           
  Lines             ?     8853           
  Branches          ?      564           
=========================================
  Hits              ?     4670           
  Misses            ?     3980           
  Partials          ?      203

See: GradleUp/shadow#425

JLLeitschuh · 2019-04-04T22:49:15Z

core/src/main/java/edu/wpi/grip/core/sockets/SocketHints.java


  /* PRIVATE PARTIALLY CONSTRUCTED BUILDERS BELOW */

+  @SuppressFBWarnings(value = "UPM", justification = "False positive")


Unused Private Method. This method is clearly used elsewhere in this file, so it's a false positive. Seems that spotbugs doesn't notice usages from inner classes

Huh. Okay then. Thanks!

ui/ui.gradle.kts

JLLeitschuh · 2019-04-04T22:52:46Z

Why the 14% code coverage drop? Also, it's good to see the @codecov-io bot back on this PR.

SamCarlberg · 2019-04-04T22:54:30Z

Codecov is currently running on Azure, so UI tests aren't included in the reports

JLLeitschuh · 2019-04-04T23:09:55Z

Codecov is currently running on Azure, so UI tests aren't included in the reports

😢 Ah well.

JLLeitschuh · 2019-04-15T20:57:28Z

Status on this?

SamCarlberg · 2019-04-15T20:58:27Z

Currently getting UI tests and JaCoCo running on its own VM with Java 8. I think this PR should be good to merge once that's done

JLLeitschuh · 2019-04-16T14:11:50Z

Ping me when you want me to take a final look. Thanks for investing the time to keep the UI tests running. They are really valuable to have!

SamCarlberg added 20 commits March 26, 2019 18:35

Merge branch 'master' into java-13

e5ccff0

Remove dependency on Guava in annotation processor

5e0d6dd

Bump supported source version to 11

Update CI scripts

a0f2fef

Remove Oracle JDK references from Azure linux

f714379

Fix backslash

32ad881

Install JDK 13 on 64-bit machines

1e3d3a1

Specify jdk 11 in gradle

b15cba9

Style checks for annotation processor

e383b7d

PMD for code generation tests

8ad9557

Cross-platform package icons

948f06f

Set Linux extraction dir, fix Windows powershell

e69605f

Clean up gradle

bc61132

I am an idiot

b6ccf0f

Do not run jpackage on 32-bit Windows job

9ee924c

Fix Win64 JDK13 location

bfcbb2a

Use the running JDK to build a jlink image

5684224

Instead of letting jpackage create the image, which would result in a Java 13 runtime

Support OS file integration

13b00a2

Double-click on foo.grip to open it in GRIP

Make OS-specific resources directories

26be565

Add file association support for windows

Move jlink execution to its own task, pass in as parameter to jpackage

851bb70

SamCarlberg added type: enhancement type: build Java packager labels Apr 2, 2019

SamCarlberg added this to the v1.6.0 milestone Apr 2, 2019

JLLeitschuh reviewed Apr 3, 2019

View reviewed changes

build.gradle.kts Outdated Show resolved Hide resolved

JLLeitschuh reviewed Apr 3, 2019

View reviewed changes

buildSrc/src/main/kotlin/PlatformMapper.kt Outdated Show resolved Hide resolved

JLLeitschuh reviewed Apr 3, 2019

View reviewed changes

buildSrc/src/main/kotlin/PlatformMapper.kt Show resolved Hide resolved

JLLeitschuh reviewed Apr 3, 2019

View reviewed changes

core/src/main/java/edu/wpi/grip/core/operations/composite/PublishVideoOperation.java Outdated Show resolved Hide resolved

SamCarlberg added 2 commits April 4, 2019 16:00

Re-enable spotbugs

09ff42e

Several new false positives have popped up, though

Format PlatformMapper, fix PublishVideoOperation

f29cb6b

Support running on JDK 8 to run UI tests

bb0d298

Update travis and appveyor to only run checks, not do native builds

Roll shadow plugin back to 4.0.1 to avoid issues with :core:shadowjar

cd2e97c

See: GradleUp/shadow#425

JLLeitschuh reviewed Apr 4, 2019

View reviewed changes

ui/ui.gradle.kts Outdated Show resolved Hide resolved

SamCarlberg added 3 commits April 15, 2019 16:24

Put jlink-ed modules in a list instead of hardcoded string

1b7ef4f

Add mac agent dedicated for UI tests and JaCoCo reports

2a3926a

Upload JaCoCo reports from new agent

39f126e

SamCarlberg added 3 commits April 17, 2019 14:50

Merge branch 'master' into java-13

949cc71

Fix checks from CUDA PR

9dfc7c6

More spotbugs false positives

89224ec

SamCarlberg merged commit f789fb2 into WPIRoboticsProjects:master Apr 17, 2019

SamCarlberg deleted the java-13 branch April 17, 2019 22:56


		/* PRIVATE PARTIALLY CONSTRUCTED BUILDERS BELOW */

		@SuppressFBWarnings(value = "UPM", justification = "False positive")

Comments

Conversation

SamCarlberg commented Apr 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

JLLeitschuh Apr 3, 2019

Choose a reason for hiding this comment

Uh oh!

SamCarlberg Apr 4, 2019

Choose a reason for hiding this comment

Uh oh!

JLLeitschuh Apr 3, 2019

Choose a reason for hiding this comment

Uh oh!

SamCarlberg Apr 4, 2019

Choose a reason for hiding this comment

Uh oh!

JLLeitschuh Apr 15, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JLLeitschuh commented Apr 3, 2019

Uh oh!

SamCarlberg commented Apr 4, 2019

Uh oh!

JLLeitschuh commented Apr 4, 2019

Uh oh!

codecov-io commented Apr 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

JLLeitschuh Apr 4, 2019

Choose a reason for hiding this comment

Uh oh!

SamCarlberg Apr 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JLLeitschuh Apr 4, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JLLeitschuh commented Apr 4, 2019

Uh oh!

SamCarlberg commented Apr 4, 2019

Uh oh!

JLLeitschuh commented Apr 4, 2019

Uh oh!

JLLeitschuh commented Apr 15, 2019

Uh oh!

SamCarlberg commented Apr 15, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JLLeitschuh commented Apr 16, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

SamCarlberg commented Apr 2, 2019 •

edited

Loading

codecov-io commented Apr 4, 2019 •

edited

Loading

SamCarlberg Apr 4, 2019 •

edited

Loading

SamCarlberg commented Apr 15, 2019 •

edited

Loading