Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Change deprecated classesDir for classesDirs #174

Merged
merged 3 commits into from
Mar 8, 2019
Merged

Change deprecated classesDir for classesDirs #174

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27fe12f
classesDir is deprecated in Gradle 4.x and should use classesDirs ins…
pablisco Mar 4, 2019
695b1b5
Updated FindBugs to use multiple classesDirs
pablisco Mar 5, 2019
5a9b07c
Simplify logic creating tree of classes
mr-archano Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 7 additions & 9 deletions ...n/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ class FindbugsConfigurator extends CodeQualityConfigurator<FindBugs, FindBugsExt
}

private FileCollection getAndroidClasses(Object variant, List<String> includes) {
includes.isEmpty() ? project.files() : project.fileTree(variant.javaCompile.destinationDir).include(includes)
includes.isEmpty() ? project.files() : project.fileTree(variant.javaCompile.destinationDir).include(includes) as ConfigurableFileTree
}

@Override
Expand Down Expand Up @@ -118,17 +118,15 @@ class FindbugsConfigurator extends CodeQualityConfigurator<FindBugs, FindBugsExt
}

private FileCollection getJavaClasses(SourceSet sourceSet, List<String> includes) {
includes.isEmpty() ? project.files() : createClassesTreeFrom(sourceSet).include(includes)
includes.isEmpty() ? project.files() : createClassesTreeFrom(sourceSet).include(includes) as ConfigurableFileTree
}

/**
* The simple "classes = sourceSet.output" may lead to non-existing resources directory
* being passed to FindBugs Ant task, resulting in an error
* */
private ConfigurableFileTree createClassesTreeFrom(SourceSet sourceSet) {
project.fileTree(sourceSet.output.classesDir, {
it.builtBy(sourceSet.output)
})
def fileTree = sourceSet.output.classesDirs.inject(null) { cumulativeTree, classesDir ->
def tree = project.fileTree(classesDir)
cumulativeTree?.plus(tree) ?: tree
}
fileTree.builtBy(sourceSet.output)
}

@Override
Expand Down