From 9f618a82244c9df268845f299aa099730c3670f0 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 28 Feb 2022 12:40:17 -0700
Subject: [PATCH] fix hooks
---
build.gradle | 7 ++-----
gradle/spotbugs.gradle | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/build.gradle b/build.gradle
index 321f486..285e8c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,12 +17,7 @@ task runHazard(type: JavaExec) {
dependsOn(":src:hazard:run")
}
-apply from: "${rootDir}/gradle/dependencies.gradle"
apply from: "${rootDir}/gradle/node.gradle"
-apply from: "${rootDir}/gradle/spotbugs.gradle"
-apply from: "${rootDir}/gradle/spotless.gradle"
-apply from: "${rootDir}/gradle/repositories.gradle"
-
subprojects {
apply plugin: "application"
@@ -46,6 +41,8 @@ subprojects {
apply from: "${rootDir}/gradle/dependencies.gradle"
apply from: "${rootDir}/gradle/git-hooks.gradle"
apply from: "${rootDir}/gradle/repositories.gradle"
+ apply from: "${rootDir}/gradle/spotbugs.gradle"
+ apply from: "${rootDir}/gradle/spotless.gradle"
test {
useJUnitPlatform()
diff --git a/gradle/spotbugs.gradle b/gradle/spotbugs.gradle
index 51f1a63..32ae4ab 100644
--- a/gradle/spotbugs.gradle
+++ b/gradle/spotbugs.gradle
@@ -6,6 +6,6 @@ apply plugin: "com.github.spotbugs"
* See https://spotbugs.readthedocs.io
*/
spotbugs {
- excludeFilter = file("${projectDir}/gradle/spotbugs-filter.xml")
+ excludeFilter = file("${rootDir}/gradle/spotbugs-filter.xml")
effort = "max"
}
--
GitLab