Merge pull request #180 from novoda/fix_findbugs_configuration_2

Fix Findbugs configuration (part 2)

plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy

@@ -118,12 +118,14 @@ class FindbugsConfigurator extends CodeQualityConfigurator<FindBugs, FindBugsExt
  }
 
  private FileCollection getJavaClasses(SourceSet sourceSet, List<String> includes) {
- includes.isEmpty() ? project.files() : createClassesTreeFrom(sourceSet).include(includes) as ConfigurableFileTree
+ includes.isEmpty() ? project.files() : createClassesTreeFrom(sourceSet, includes)
  }
 
- private ConfigurableFileTree createClassesTreeFrom(SourceSet sourceSet) {
- return sourceSet.output.classesDirs.inject(null) { cumulativeTree, classesDir ->
- def tree = project.fileTree(classesDir).builtBy(sourceSet.output)
+ private FileCollection createClassesTreeFrom(SourceSet sourceSet, List<String> includes) {
+ return sourceSet.output.classesDirs.inject(null) { ConfigurableFileTree cumulativeTree, File classesDir ->
+ def tree = project.fileTree(classesDir)
+ .builtBy(sourceSet.output)
+ .include(includes) as ConfigurableFileTree
  cumulativeTree?.plus(tree) ?: tree
  }
  }

sample-multi-module/build.gradle

@@ -32,7 +32,7 @@ subprojects {
  }
 }
 
-wrapper {
- gradleVersion = '4.10.2'
+tasks.wrapper {
+ gradleVersion = '5.2.1'
  distributionType = Wrapper.DistributionType.ALL
 }

sample-multi-module/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample-multi-module/gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

sample-multi-module/gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

sample/build.gradle

@@ -23,7 +23,7 @@ subprojects {
  }
 }
 
-wrapper {
- gradleVersion = '4.10.2'
+tasks.wrapper {
+ gradleVersion = '5.2.1'
  distributionType = Wrapper.DistributionType.ALL
 }

sample/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample/gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

sample/gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome