From dd9f1af2e8bb31220e32f32c808a815e21d699e9 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Thu, 9 Aug 2018 22:43:53 -0400 Subject: [PATCH 1/4] Update errorprone config for Java 10 --- build.gradle | 1 - shared/java/javacommon.gradle | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index c6a5dffac49..c5916a6fb03 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,4 @@ plugins { - id 'net.ltgt.errorprone' version '0.0.15' id 'base' id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '2.1' id 'edu.wpi.first.NativeUtils' version '1.7.1' diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle index f92028edd9d..4438a0d5eb2 100644 --- a/shared/java/javacommon.gradle +++ b/shared/java/javacommon.gradle @@ -1,6 +1,5 @@ apply plugin: 'maven-publish' apply plugin: 'java' -apply plugin: 'net.ltgt.errorprone' def pubVersion if (project.hasProperty("publishVersion")) { @@ -104,14 +103,22 @@ compileJava { targetCompatibility = 1.8 } +configurations { + devCompileOnly.extendsFrom compileOnly + testCompileOnly.extendsFrom compileOnly +} + dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.2.0' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.2.0' + compileOnly 'com.google.errorprone:error_prone_core:2.3.1' devCompile sourceSets.main.output +} - errorprone 'com.google.errorprone:error_prone_core:2.3.1' +tasks.withType(JavaCompile) { + options.compilerArgs << '-Xplugin:ErrorProne' << '-XDcompilePolicy=byfile' } task run(type: JavaExec) { From 446ead6ae4c7658830bac2de94450b21d77ccf5d Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Thu, 9 Aug 2018 22:57:44 -0400 Subject: [PATCH 2/4] Use plugin --- build.gradle | 1 + shared/java/javacommon.gradle | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index c5916a6fb03..84825b73dc8 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ plugins { id 'edu.wpi.first.GradleVsCode' version '0.4.1' id 'idea' id 'com.gradle.build-scan' version '1.15.1' + id 'net.ltgt.errorprone-javacplugin' version '0.3' } repositories { diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle index 4438a0d5eb2..a6bf7e321d2 100644 --- a/shared/java/javacommon.gradle +++ b/shared/java/javacommon.gradle @@ -1,5 +1,6 @@ apply plugin: 'maven-publish' apply plugin: 'java' +apply plugin: 'net.ltgt.errorprone-javacplugin' def pubVersion if (project.hasProperty("publishVersion")) { @@ -103,24 +104,16 @@ compileJava { targetCompatibility = 1.8 } -configurations { - devCompileOnly.extendsFrom compileOnly - testCompileOnly.extendsFrom compileOnly -} - dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.2.0' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.2.0' - compileOnly 'com.google.errorprone:error_prone_core:2.3.1' + + errorprone 'com.google.errorprone:error_prone_core:2.3.1' devCompile sourceSets.main.output } -tasks.withType(JavaCompile) { - options.compilerArgs << '-Xplugin:ErrorProne' << '-XDcompilePolicy=byfile' -} - task run(type: JavaExec) { classpath = sourceSets.dev.runtimeClasspath From 4bf99205bf877524495d10aacf997e5a5b827db7 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Thu, 9 Aug 2018 22:58:31 -0400 Subject: [PATCH 3/4] Minimize change --- shared/java/javacommon.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle index a6bf7e321d2..69ed6bb0478 100644 --- a/shared/java/javacommon.gradle +++ b/shared/java/javacommon.gradle @@ -108,10 +108,10 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.2.0' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.2.0' - - errorprone 'com.google.errorprone:error_prone_core:2.3.1' devCompile sourceSets.main.output + + errorprone 'com.google.errorprone:error_prone_core:2.3.1' } task run(type: JavaExec) { From 04ca3cc38765d333f09e9d5e9ac1b4bb6a768849 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Fri, 10 Aug 2018 08:01:04 -0400 Subject: [PATCH 4/4] Support Java 8/9+ --- build.gradle | 3 ++- shared/java/javacommon.gradle | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 84825b73dc8..2578558f9ec 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,8 @@ plugins { id 'edu.wpi.first.GradleVsCode' version '0.4.1' id 'idea' id 'com.gradle.build-scan' version '1.15.1' - id 'net.ltgt.errorprone-javacplugin' version '0.3' + id 'net.ltgt.errorprone' version '0.0.15' apply false // For Java 8 + id 'net.ltgt.errorprone-javacplugin' version '0.3' apply false // For Java 9+ } repositories { diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle index 69ed6bb0478..6efc975e2f7 100644 --- a/shared/java/javacommon.gradle +++ b/shared/java/javacommon.gradle @@ -1,6 +1,11 @@ apply plugin: 'maven-publish' apply plugin: 'java' -apply plugin: 'net.ltgt.errorprone-javacplugin' + +if (JavaVersion.current() == JavaVersion.VERSION_1_8) { + apply plugin: 'net.ltgt.errorprone' +} else { + apply plugin: 'net.ltgt.errorprone-javacplugin' +} def pubVersion if (project.hasProperty("publishVersion")) {