diff --git a/gradle/spotbugs.gradle b/gradle/spotbugs.gradle index f7b104189c3e600bd7e7e2c39d5d47926ed3afa4..4fbb1f87de5a0fd6712fc1ae113eb9a412ada703 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 bb5d54230e62d024205074204ceac85c2f1f3676..c9c003417eb151552aea6ce61920c349316d47b6 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)