Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2019 RoboRIO and 2019 v4 image (#1352)

Browse Source 
Also make updates for Java 11:
* Disable errorprone plugin (currently broken on Java 11)
* Update checkstyle to 8.12
* Update pmd to 6.7.0
This commit is contained in:
Thad House
2018-10-07 18:11:57 -07:00
committed by Peter Johnson
parent 88b93c220e
commit b9fa3a4398
10 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/java/javacommon.gradle
View File

@@ -1,11 +1,6 @@
apply plugin: 'maven-publish'
apply plugin: 'java'
if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
apply plugin: 'net.ltgt.errorprone'
} else {
apply plugin: 'net.ltgt.errorprone-javacplugin'
}
//apply plugin: 'net.ltgt.errorprone'
def pubVersion
if (project.hasProperty("publishVersion")) {
@@ -98,6 +93,7 @@ if (project.hasProperty('onlyAthena')) {
repositories {
mavenCentral()
//maven.url "https://oss.sonatype.org/content/repositories/snapshots/"
}
sourceSets {
@@ -116,7 +112,8 @@ dependencies {
devCompile sourceSets.main.output
errorprone 'com.google.errorprone:error_prone_core:2.3.1'
//errorprone 'com.google.errorprone:error_prone_core:2.3.2-SNAPSHOT'
//errorproneJavac 'com.google.errorprone:error_prone_core:2.3.1'
}
task run(type: JavaExec) {

7
shared/java/javastyle.gradle
View File

@@ -3,12 +3,13 @@ apply plugin: 'checkstyle'
apply plugin: 'pmd'
checkstyle {
toolVersion = "8.10"
configFile = new File(rootDir, "styleguide/checkstyle.xml")
toolVersion = "8.12"
configDir = file("${project.rootDir}/styleguide")
config = resources.text.fromFile(new File(configDir, "checkstyle.xml"))
}
pmd {
toolVersion = '6.3.0'
toolVersion = '6.7.0'
consoleOutput = true
reportsDir = file("$project.buildDir/reports/pmd")
ruleSetFiles = files(new File(rootDir, "styleguide/pmd-ruleset.xml"))