From d9cb57a429c4e7aac86733d18955ce834cc56e99 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 28 Jun 2019 22:30:17 -0700
Subject: [PATCH] Don't build halsim_gazebo on raspbian (#1737)

Reference shared/config.gradle instead of shared/plugins/setupBuild.gradle.
---
 simulation/halsim_gazebo/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/simulation/halsim_gazebo/build.gradle b/simulation/halsim_gazebo/build.gradle
index 63e880917c..286f959c9b 100644
--- a/simulation/halsim_gazebo/build.gradle
+++ b/simulation/halsim_gazebo/build.gradle
@@ -7,6 +7,8 @@ ext.skiplinuxathena = true
 ext.skiplinuxraspbian = true
 ext.pluginName = 'halsim_gazebo'
 
+apply from: "${rootDir}/shared/config.gradle"
+
 /* If gz_msgs or gazebo is not available, do not attempt a build */
 def gazebo_version = ""
 def gazebo_cppflags = ""
@@ -34,10 +36,8 @@ if (!gazebo_version?.trim()) {
 evaluationDependsOn(":simulation:gz_msgs")
 def gz_msgs_project = project(":simulation:gz_msgs")
 
-if (!gz_msgs_project.hasProperty('skip_gz_msgs') && !project.hasProperty('skip_frc_plugins')) {
-
-    apply from: "${rootDir}/shared/plugins/setupBuild.gradle"
-
+tasks.whenTaskAdded { task ->
+    task.onlyIf { !gz_msgs_project.hasProperty('skip_gz_msgs') && !project.hasProperty('skip_frc_plugins') }
 }
 
 model {