From b95fe4bdb1e7acfb3b2e6ac06e2042465efd173a Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Mon, 18 May 2020 07:34:26 -0600
Subject: [PATCH] add libs directory
---
gradle/spotbugs.gradle | 6 +++++-
gradle/spotless.gradle | 6 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/gradle/spotbugs.gradle b/gradle/spotbugs.gradle
index f7b10418..4fbb1f87 100644
--- a/gradle/spotbugs.gradle
+++ b/gradle/spotbugs.gradle
@@ -6,7 +6,11 @@ apply plugin: "com.github.spotbugs"
* See https://spotbugs.readthedocs.io
*/
spotbugs {
- excludeFilter = file("../nshmp-lib/gradle/spotbugs-exclude-filter.xml")
+ if (name == 'nshmp-lib') {
+ excludeFilter = file("./gradle/spotbugs-exclude-filter.xml")
+ } else {
+ excludeFilter = file("libs/nshmp-lib/gradle/spotbugs-exclude-filter.xml")
+ }
effort = "max"
ignoreFailures = true // TODO remove once code is up to date
}
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index bb5d5423..c9c00341 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -14,7 +14,7 @@ apply plugin: "com.diffplug.gradle.spotless"
spotless {
/* Java formatting */
java {
- targetExclude "**/build", "bin", "**/Scratch*.java", "tmp"
+ targetExclude "**/build", "bin", "**/Scratch*.java", "tmp", "libs"
removeUnusedImports()
@@ -43,7 +43,7 @@ spotless {
/* Markdown, YAML, .gitignore, Bash, and Dockerfile formatting */
format "misc", {
target "**/*.md", "**/*.yml", "**/.gitgnore", "**/*.sh", "**/*Dockerfile"
- targetExclude "**/build", ".gradle", ".settings", "tmp"
+ targetExclude "**/build", ".gradle", ".settings", "tmp", "libs"
trimTrailingWhitespace()
indentWithSpaces(2)
endWithNewline()
@@ -54,7 +54,7 @@ spotless {
format "xml", {
target fileTree(".") {
include "**/*.xml"
- exclude "**/build", ".settings", ".classpath", ".project", "tmp", ".gradle"
+ exclude "**/build", ".settings", ".classpath", ".project", "tmp", ".gradle", "libs"
}
eclipseWtp("xml")
indentWithSpaces(2)
--
GitLab