Update to gradle 6.0 (#2074)

This commit is contained in:
Thad House
2019-11-12 17:14:04 -08:00
committed by Peter Johnson
parent 3cce61b89f
commit 708009cd20
30 changed files with 159 additions and 161 deletions

View File

@@ -11,15 +11,15 @@ apply from: "${rootDir}/shared/opencv.gradle"
dependencies {
compile project(':wpilibj')
implementation project(':wpilibj')
compile project(':hal')
compile project(':wpiutil')
compile project(':ntcore')
compile project(':cscore')
compile project(':cameraserver')
compile project(':wpilibOldCommands')
compile project(':wpilibNewCommands')
implementation project(':hal')
implementation project(':wpiutil')
implementation project(':ntcore')
implementation project(':cscore')
implementation project(':cameraserver')
implementation project(':wpilibOldCommands')
implementation project(':wpilibNewCommands')
}
if (!project.hasProperty('skipPMD')) {

View File

@@ -12,8 +12,8 @@ def commandsZipBaseName = '_GROUP_edu_wpi_first_wpilibj_ID_commands_CLS'
def outputsFolder = file("$project.buildDir/outputs")
task javaExamplesZip(type: Zip) {
destinationDir = outputsFolder
baseName = examplesZipBaseName
destinationDirectory = outputsFolder
archiveBaseName = examplesZipBaseName
from(licenseFile) {
into '/'
@@ -25,8 +25,8 @@ task javaExamplesZip(type: Zip) {
}
task javaTemplatesZip(type: Zip) {
destinationDir = outputsFolder
baseName = templatesZipBaseName
destinationDirectory = outputsFolder
archiveBaseName = templatesZipBaseName
from(licenseFile) {
into '/'
@@ -38,8 +38,8 @@ task javaTemplatesZip(type: Zip) {
}
task javaCommandsZip(type: Zip) {
destinationDir = outputsFolder
baseName = commandsZipBaseName
destinationDirectory = outputsFolder
archiveBaseName = commandsZipBaseName
from(licenseFile) {
into '/'