From 00d307439cc21cbc2d1357a4b402151db29c76fd Mon Sep 17 00:00:00 2001 From: Jade Date: Thu, 26 Dec 2024 01:25:12 +0800 Subject: [PATCH] Remove duplicated dependencies blocks (#1648) --- build.gradle | 5 ++++- photon-core/build.gradle | 4 +--- photon-docs/build.gradle | 8 ++------ photon-lib/build.gradle | 4 +--- photon-server/build.gradle | 11 ++++------- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index dcb869c90..924430213 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ import edu.wpi.first.toolchain.* plugins { - id "java" id "cpp" id "com.diffplug.spotless" version "6.24.0" id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2" @@ -9,6 +8,10 @@ plugins { id 'edu.wpi.first.WpilibTools' version '1.3.0' id 'com.google.protobuf' version '0.9.3' apply false id 'edu.wpi.first.GradleJni' version '1.1.0' + id "org.ysb33r.doxygen" version "1.0.4" apply false + id 'com.gradleup.shadow' version '8.3.4' apply false + id "com.github.node-gradle.node" version "7.0.1" apply false + id "org.hidetake.ssh" version "2.11.2" apply false } allprojects { diff --git a/photon-core/build.gradle b/photon-core/build.gradle index f23854118..0f94fbec5 100644 --- a/photon-core/build.gradle +++ b/photon-core/build.gradle @@ -1,6 +1,4 @@ -plugins { - id 'edu.wpi.first.WpilibTools' version '1.3.0' -} +apply plugin: 'edu.wpi.first.WpilibTools' import java.nio.file.Path diff --git a/photon-docs/build.gradle b/photon-docs/build.gradle index 092d62a20..da0a1d1d1 100644 --- a/photon-docs/build.gradle +++ b/photon-docs/build.gradle @@ -1,10 +1,6 @@ // From allwpilib/docs. Licensed under the WPILib BSD License - -plugins { - id 'java' - id "org.ysb33r.doxygen" version "1.0.4" -} - +apply plugin: "java" +apply plugin: "org.ysb33r.doxygen" evaluationDependsOn ':photon-targeting' evaluationDependsOn ':photon-core' diff --git a/photon-lib/build.gradle b/photon-lib/build.gradle index 1e2f76106..443750dad 100644 --- a/photon-lib/build.gradle +++ b/photon-lib/build.gradle @@ -1,6 +1,4 @@ -plugins { - id 'edu.wpi.first.WpilibTools' version '1.3.0' -} +apply plugin: 'edu.wpi.first.WpilibTools' import java.nio.file.Path diff --git a/photon-server/build.gradle b/photon-server/build.gradle index 5a0e09cc2..e78ad07c7 100644 --- a/photon-server/build.gradle +++ b/photon-server/build.gradle @@ -1,10 +1,7 @@ -plugins { - id "application" - id 'com.gradleup.shadow' version '8.3.4' - id "com.github.node-gradle.node" version "7.0.1" - id "org.hidetake.ssh" version "2.11.2" - id 'edu.wpi.first.WpilibTools' version '1.3.0' -} +apply plugin: "org.hidetake.ssh" +apply plugin: "com.github.node-gradle.node" +apply plugin: 'com.gradleup.shadow' +apply plugin: "application" apply from: "${rootDir}/shared/common.gradle"