mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
Update to gradle 6.0 (#2074)
This commit is contained in:
committed by
Peter Johnson
parent
3cce61b89f
commit
708009cd20
@@ -1,5 +1,5 @@
|
||||
apply plugin: 'maven-publish'
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'java-library'
|
||||
//apply plugin: 'net.ltgt.errorprone'
|
||||
apply plugin: 'jacoco'
|
||||
|
||||
@@ -20,21 +20,21 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
|
||||
}
|
||||
|
||||
task outputJar(type: Jar, dependsOn: classes) {
|
||||
baseName javaBaseName
|
||||
destinationDir outputsFolder
|
||||
archiveBaseName = javaBaseName
|
||||
destinationDirectory = outputsFolder
|
||||
from sourceSets.main.output
|
||||
}
|
||||
|
||||
task outputSourcesJar(type: Jar, dependsOn: classes) {
|
||||
baseName javaBaseName
|
||||
destinationDir outputsFolder
|
||||
archiveBaseName = javaBaseName
|
||||
destinationDirectory = outputsFolder
|
||||
classifier = 'sources'
|
||||
from sourceSets.main.allSource
|
||||
}
|
||||
|
||||
task outputJavadocJar(type: Jar, dependsOn: javadoc) {
|
||||
baseName javaBaseName
|
||||
destinationDir outputsFolder
|
||||
archiveBaseName = javaBaseName
|
||||
destinationDirectory = outputsFolder
|
||||
classifier = 'javadoc'
|
||||
from javadoc.destinationDir
|
||||
}
|
||||
@@ -104,7 +104,7 @@ dependencies {
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.4.2'
|
||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
|
||||
|
||||
devCompile sourceSets.main.output
|
||||
devImplementation sourceSets.main.output
|
||||
|
||||
//errorprone 'com.google.errorprone:error_prone_core:2.3.2-SNAPSHOT'
|
||||
//errorproneJavac 'com.google.errorprone:error_prone_core:2.3.1'
|
||||
|
||||
@@ -3,8 +3,8 @@ apply plugin: 'checkstyle'
|
||||
|
||||
checkstyle {
|
||||
toolVersion = "8.12"
|
||||
configDir = file("${project.rootDir}/styleguide")
|
||||
config = resources.text.fromFile(new File(configDir, "checkstyle.xml"))
|
||||
configDirectory = file("${project.rootDir}/styleguide")
|
||||
config = resources.text.fromFile(new File(configDirectory.get().getAsFile(), "checkstyle.xml"))
|
||||
}
|
||||
|
||||
if (!project.hasProperty('skipPMD')) {
|
||||
|
||||
Reference in New Issue
Block a user