diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c1d6e3f8f5..73e85a782e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -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: ''
diff --git a/build.gradle b/build.gradle
index 54fa394b23..9df4287654 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0d4a951687..457aad0d98 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a95009c3b9..75b8c7c8c6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/gradlew b/gradlew
index cccdd3d517..af6708ff22 100755
--- a/gradlew
+++ b/gradlew
@@ -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"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6a2..0f8d5937c4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -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
diff --git a/myRobot/build.gradle b/myRobot/build.gradle
index 30dd721924..0c047e84d7 100644
--- a/myRobot/build.gradle
+++ b/myRobot/build.gradle
@@ -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'
diff --git a/settings.gradle b/settings.gradle
index 3f72631d11..f025441b6e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,7 +4,6 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
-enableFeaturePreview('STABLE_PUBLISHING')
 
 include 'wpiutil'
 include 'ntcore'
diff --git a/simulation/frc_gazebo_plugins/build.gradle b/simulation/frc_gazebo_plugins/build.gradle
index 829c4c778e..6d3c90887d 100644
--- a/simulation/frc_gazebo_plugins/build.gradle
+++ b/simulation/frc_gazebo_plugins/build.gradle
@@ -5,6 +5,7 @@ apply plugin: 'cpp'
 apply plugin: "google-test"
 
 ext.skipAthena = true
+ext.skipRaspbian = true
 
 apply from: "${rootDir}/shared/config.gradle"
 
diff --git a/simulation/gz_msgs/build.gradle b/simulation/gz_msgs/build.gradle
index 126cc012e0..8264ceb2b8 100644
--- a/simulation/gz_msgs/build.gradle
+++ b/simulation/gz_msgs/build.gradle
@@ -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
diff --git a/simulation/halsim_gazebo/build.gradle b/simulation/halsim_gazebo/build.gradle
index 0e410b2deb..d9c22178cd 100644
--- a/simulation/halsim_gazebo/build.gradle
+++ b/simulation/halsim_gazebo/build.gradle
@@ -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 {
diff --git a/wpilibjIntegrationTests/build.gradle b/wpilibjIntegrationTests/build.gradle
index 0c835d4b91..2fc6793f03 100644
--- a/wpilibjIntegrationTests/build.gradle
+++ b/wpilibjIntegrationTests/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'java'
     id 'application'
-    id 'com.github.johnrengelman.shadow' version '2.0.3' apply false
 }
 
 ext {