Upgrade to Gradle 5.0 by SamCarlberg · Pull Request #900 · WPIRoboticsProjects/GRIP

SamCarlberg · 2019-01-11T23:14:50Z

The buildSrc project has been removed
- The generated classes have been pulled into :core
- Since each run gave the same output, this subproject was effectively redundant
Each subproject now has its own buildscript
Switch to the Kotlin DSL
- The Linux launcher has to stay on the Groovy DSL due to the C++ model not working with the Kotlin one

Supersedes and closes #860

Remove errorprone Remove findbugs Remove buildSrc project Move generated code into core Give each project its own buildscript Remove AutoValue, replace with lombok

Revert lombok change

Fix new a problem identified by spotbugs

codecov-io · 2019-01-13T16:33:14Z

Codecov Report

Merging #900 into master will decrease coverage by 1.34%.
The diff coverage is 21.82%.

@@             Coverage Diff              @@
##             master     #900      +/-   ##
============================================
- Coverage     51.71%   50.37%   -1.35%     
============================================
  Files           247      304      +57     
  Lines          7812     8318     +506     
  Branches        533      535       +2     
============================================
+ Hits           4040     4190     +150     
- Misses         3590     3951     +361     
+ Partials        182      177       -5

AustinShalit

* Where:
Build file '/Users/austinshalit/git/GRIP/build.gradle.kts' line: 50

* What went wrong:
No .git directory found!

AustinShalit · 2019-01-14T09:58:59Z

And yes... there is a git directory.

JLLeitschuh · 2019-01-14T15:41:55Z

.travis.yml

 script:
  # Only run code generation tests on OSX -- linux requires sudo to install OpenCV dependencies, and that environment
  # will not be able to run MainWindowTest.testDragOperationFromPaletteToPipeline
-  - ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests --scan;


Why the removal of the --scan?

It was causing Travis to fail from having to accept the license agreement. Since Travis is getting removed anyway, I'm not worried about temporarily reducing its workload to keep the important stuff working until then

JLLeitschuh · 2019-01-14T15:52:16Z

build.gradle.kts

+    repositories {
+        jcenter()
+        maven {
+            setUrl("https://github.com/WPIRoboticsProjects/opencv-maven/raw/mvn-repo")


HTTPS support. Wonderful!

Github might get pissy though if we keep using them as a maven repo.

JLLeitschuh · 2019-01-14T15:52:44Z

build.gradle.kts

@@ -0,0 +1,201 @@
+import org.ajoberstar.grgit.Grgit
+import com.github.spotbugs.*


Can we avoid wildcard imports?

JLLeitschuh · 2019-01-14T15:53:12Z

build.gradle.kts

+tasks.withType<Wrapper>().configureEach {
+    gradleVersion = "5.0"
+    distributionType = Wrapper.DistributionType.ALL
+}


I usually keep this at the bottom. Why 5.0 instead of 5.1? The memory leak issue?

JLLeitschuh · 2019-01-14T15:54:10Z

build.gradle.kts

+        plugin("org.ajoberstar.grgit")
+    }
+    grgit = Grgit.open()
+}


You could do this as:

val grgit: Grgit? by lazy { // blah.... }

JLLeitschuh · 2019-01-14T15:55:41Z

build.gradle.kts

+        jcenter()
+        maven {
+            name = "WPILib Maven Release"
+            setUrl("http://first.wpi.edu/FRC/roborio/maven/release")


Booo. Not a fan of http here.

Can you use the new Gradle repository filers so that only artifacts that are actually on these servers get searched in these repos?

https://docs.gradle.org/current/userguide/declaring_repositories.html#declaring_a_repository_filter

first.wpi.edu unfortunately does not have an HTTPS cert
The repository filter looks nice, though

Darn, the filtering isn't available in 5.0

Is there any sort of hash validation we can do before we just start arbitrarily running code that was downloaded insecurely?

Is there some way we can validate the SHA 256 hash of it first or something?

I don't think there's anything we can do beyond what I assume Gradle does already with using the .md5 or .sha hash files in the Maven repo.

This is also out of scope for this PR

Fair enough.

JLLeitschuh · 2019-01-14T15:57:51Z

build.gradle.kts

+        reports {
+            xml.isEnabled = false
+            emacs.isEnabled = true
+        }


You can get spotbugs to produce an html report if we don't want to deal with the emacs one anymore.

JLLeitschuh · 2019-01-14T15:58:11Z

build.gradle.kts

+    }
+
+    tasks.withType<Javadoc> {
+        source(tasks.named<JavaCompile>("compileJava").map { it.source })


JLLeitschuh · 2019-01-14T15:59:49Z

build.gradle.kts

+        additionalSourceDirs(srcFiles)
+        sourceDirectories.from(srcFiles)
+        classDirectories.from(files(sourceSets["main"].output))
+        executionData.from(tasks.named<JacocoReport>("jacocoTestReport").map { it.executionData })


Are these froms cumulative or last one wins?

This is the logic I've been using for creating a root report recently.

https://github.com/JLLeitschuh/kotlin-guiced/blob/master/kotlin-guiced.gradle.kts#L148-L178

I have no idea. This is just a port of the old task (which wasn't ever running AFAICT) to Kotlin.

JLLeitschuh · 2019-01-14T16:02:50Z

settings.gradle

+    }
+    assert project.buildFile.isFile(): "File named $groovyName or $kotlinName must exist."
+    project.children.each { setUpChildProject(it) }
+}


This file can be Kotlin based now if you want it to be. Up to you though.

JLLeitschuh · 2019-01-14T16:03:22Z

ui/preloader/preloader.gradle.kts

+tasks.named<JavaExec>("run") {
+    classpath = sourceSets["main"].runtimeClasspath
+    main = application.mainClassName
+    args = listOf("windowed")


For launching the preloader by itself. See the preloader application class

JLLeitschuh · 2019-01-14T16:04:14Z

ui/ui.gradle.kts

+    compile(group = "com.hierynomus", name = "sshj", version = "0.16.0")
+    compile(group = "org.apache.velocity", name = "velocity", version = "1.7")
+
+    val coreTestOutput = project(":core").dependencyProject.sourceSets["test"].output


Eventually, we should fix this better.

ui/ui.gradle.kts

JLLeitschuh

Overall really nice work. Just a few comments on things to potentially clean up.

JLLeitschuh

LGTM!

SamCarlberg added 9 commits January 11, 2019 11:59

Move to Gradle 5.0

6ffd770

Remove errorprone Remove findbugs Remove buildSrc project Move generated code into core Give each project its own buildscript Remove AutoValue, replace with lombok

Use kotlin DSL where possible

b79f333

Fix some broken dependencies

1546cfa

Fix Jacoco

25092ef

Re-enable checkstyle and PMD

4c244f1

Fix versioning and native installer

1d2230c

Delete old gradle build file

a7e697f

Re-enable errorprone

f55fe49

Revert lombok change

Add spotbugs

ebb173f

Fix new a problem identified by spotbugs

SamCarlberg added type: enhancement type: build labels Jan 11, 2019

SamCarlberg requested a review from JLLeitschuh January 11, 2019 23:14

SamCarlberg added 2 commits January 13, 2019 11:21

Merge branch 'master' into gradle-5.0

7e74895

Do not run build scans on Travis

91d3d29

SamCarlberg mentioned this pull request Jan 13, 2019

Set up CI with Azure Pipelines #903

Merged

AustinShalit requested changes Jan 14, 2019

View reviewed changes

JLLeitschuh reviewed Jan 14, 2019

View reviewed changes

Merge branch 'master' into gradle-5.0

11d4d0e

JLLeitschuh reviewed Jan 14, 2019

View reviewed changes

build.gradle.kts

}

tasks.withType<Javadoc> {

source(tasks.named<JavaCompile>("compileJava").map { it.source })

Copy link

Member

JLLeitschuh Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

JLLeitschuh reviewed Jan 14, 2019

View reviewed changes

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

JLLeitschuh reviewed Jan 14, 2019

View reviewed changes

ui/ui.gradle.kts Show resolved Hide resolved

JLLeitschuh requested changes Jan 14, 2019

View reviewed changes

SamCarlberg added 6 commits January 14, 2019 12:10

Rename native installer packages

f0517b7

Remove evaulationDependsOn

8699685

Cleaner codegen tests exclusion

5d18b20

Re-enable buildscan, remove star import

ca3a251

Run OpenCV installation in its own task and allow relative JNI paths

bc5c6de

Run code generation tests on Azure Linux

c3596cc

JLLeitschuh approved these changes Jan 14, 2019

View reviewed changes

SamCarlberg merged commit aabca35 into WPIRoboticsProjects:master Jan 14, 2019

SamCarlberg deleted the gradle-5.0 branch January 14, 2019 18:10

This was referenced Jan 17, 2019

FindBugs -> SpotBugs #886

Closed

Gradle deprecation #852

Closed

Fix generated code so IntelliJ can build GRIP again #729

Closed

		@@ -0,0 +1,201 @@
		import org.ajoberstar.grgit.Grgit
		import com.github.spotbugs.*

Comments

Conversation

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

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

AustinShalit left a comment

Choose a reason for hiding this comment

Uh oh!

AustinShalit commented Jan 14, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JLLeitschuh Jan 14, 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!

Uh oh!

Uh oh!

JLLeitschuh left a comment

Choose a reason for hiding this comment

Uh oh!

JLLeitschuh left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

SamCarlberg commented Jan 11, 2019 •

edited

Loading

codecov-io commented Jan 13, 2019 •

edited

Loading

JLLeitschuh Jan 14, 2019 •

edited

Loading