From 852d1b9cad41de2131d0a48c6391a37e804c9b6f Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 30 Jun 2019 12:42:32 -0700 Subject: [PATCH] Don't cross-build gazebo for raspbian (#1747) --- buildSrc/build.gradle | 2 +- buildSrc/src/main/groovy/MultiBuilds.groovy | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index f71fabab5a..2fc142ed31 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,5 +5,5 @@ repositories { } } dependencies { - compile "edu.wpi.first:native-utils:2020.0.1" + compile "edu.wpi.first:native-utils:2020.0.2" } diff --git a/buildSrc/src/main/groovy/MultiBuilds.groovy b/buildSrc/src/main/groovy/MultiBuilds.groovy index 9d1611f549..31530b8a4e 100644 --- a/buildSrc/src/main/groovy/MultiBuilds.groovy +++ b/buildSrc/src/main/groovy/MultiBuilds.groovy @@ -55,21 +55,6 @@ class MultiBuilds implements Plugin { binary.buildable = false } - @Validate - @CompileStatic - // TODO: Move this to tc plugin - void disableCrossTests(BinaryContainer binaries, ExtensionContainer extContainer) { - final ToolchainExtension ext = extContainer.getByType(ToolchainExtension.class); - - for (GoogleTestTestSuiteBinarySpec binary : binaries.withType(GoogleTestTestSuiteBinarySpec.class)) { - if (ext.getCrossCompilers().findByName(binary.getTargetPlatform().getName()) != null) { - binary.tasks.withType(RunTestExecutable).each { - it.onlyIf { false } - } - } - } - } - @Mutate @CompileStatic