Upgrade to Gradle 5.0 (#1444)

Also skip raspbian for gazebo.
This commit is contained in:
Thad House
2018-11-29 23:17:06 -08:00
committed by Peter Johnson
parent 90572a3cc5
commit 5551981b3f
12 changed files with 16 additions and 12 deletions

View File

@@ -166,6 +166,9 @@ jobs:
sudo tar xvzf build/jdk.tar.gz -C /Library/Java/JavaVirtualMachines/
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/
displayName: 'Setup JDK'
- script: |
rm /Users/vsts/.gradle/init.d/log-gradle-version-plugin.gradle
displayName: 'Delete Version init script'
- task: Gradle@2
inputs:
workingDirectory: ''

View File

@@ -6,8 +6,9 @@ plugins {
id 'edu.wpi.first.GradleVsCode' version '0.6.1'
id 'idea'
id 'visual-studio'
id 'com.gradle.build-scan' version '1.15.1'
id 'com.gradle.build-scan' version '2.0.2'
id 'net.ltgt.errorprone' version '0.6' apply false
id 'com.github.johnrengelman.shadow' version '4.0.3' apply false
}
repositories {
@@ -99,5 +100,5 @@ subprojects {
}
wrapper {
gradleVersion = '4.9'
gradleVersion = '5.0'
}

Binary file not shown.

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
gradlew vendored
View File

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

2
gradlew.bat vendored
View File

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

View File

@@ -3,7 +3,6 @@ plugins {
id 'application'
id 'cpp'
id 'visual-studio'
id 'com.github.johnrengelman.shadow' version '2.0.3' apply false
}
apply plugin: 'edu.wpi.first.NativeUtils'

View File

@@ -4,7 +4,6 @@ pluginManagement {
gradlePluginPortal()
}
}
enableFeaturePreview('STABLE_PUBLISHING')
include 'wpiutil'
include 'ntcore'

View File

@@ -5,6 +5,7 @@ apply plugin: 'cpp'
apply plugin: "google-test"
ext.skipAthena = true
ext.skipRaspbian = true
apply from: "${rootDir}/shared/config.gradle"

View File

@@ -9,6 +9,7 @@ description = "A C++ and Java library to pass FRC Simulation Messages in and out
/* The simulation does not run on real hardware; so we always skip Athena */
ext.skipAthena = true
ext.skipRaspbian = true
apply from: "${rootDir}/shared/config.gradle"
/* Use a sort of poor man's autoconf to find the protobuf development

View File

@@ -4,6 +4,7 @@ apply plugin: 'edu.wpi.first.NativeUtils'
apply plugin: 'cpp'
ext.skipAthena = true
ext.skipRaspbian = true
ext.pluginName = 'halsim_gazebo'
/* If gz_msgs or gazebo is not available, do not attempt a build */
@@ -33,11 +34,11 @@ if (!gazebo_version?.trim()) {
evaluationDependsOn(":simulation:gz_msgs")
def gz_msgs_project = project(":simulation:gz_msgs")
tasks.whenTaskAdded { task ->
task.onlyIf { !gz_msgs_project.hasProperty('skip_gz_msgs') && !project.hasProperty('skip_frc_plugins') }
}
if (!gz_msgs_project.hasProperty('skip_gz_msgs') && !project.hasProperty('skip_frc_plugins')) {
apply from: "${rootDir}/shared/plugins/setupBuild.gradle"
apply from: "${rootDir}/shared/plugins/setupBuild.gradle"
}
model {
binaries {

View File

@@ -1,7 +1,6 @@
plugins {
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '2.0.3' apply false
}
ext {