From 52b3974c4f761b11f1d2087d93c2ea67e3a14edb Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 20 Dec 2014 01:49:09 +0100
Subject: [PATCH] Run checkstyle and findbugs on k9mail-library

---
 gradle/plugins/checkstyle-android.gradle | 12 ++++++++++
 gradle/plugins/findbugs-android.gradle   | 14 ++++++++++++
 k9mail-library/build.gradle              |  2 ++
 k9mail/build.gradle                      | 28 ++----------------------
 4 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 gradle/plugins/checkstyle-android.gradle
 create mode 100644 gradle/plugins/findbugs-android.gradle

diff --git a/gradle/plugins/checkstyle-android.gradle b/gradle/plugins/checkstyle-android.gradle
new file mode 100644
index 000000000..7eb193767
--- /dev/null
+++ b/gradle/plugins/checkstyle-android.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'checkstyle'
+
+check.dependsOn 'checkstyle'
+task checkstyle(type: Checkstyle) {
+    ignoreFailures = true
+    configFile file("$rootProject.projectDir/config/checkstyle/checkstyle.xml")
+
+    source = project.android.sourceSets.main.java.getSrcDirs() +
+            project.android.sourceSets.androidTest.java.getSrcDirs()
+    include '**/*.java'
+    classpath = files()
+}
diff --git a/gradle/plugins/findbugs-android.gradle b/gradle/plugins/findbugs-android.gradle
new file mode 100644
index 000000000..ee83f1808
--- /dev/null
+++ b/gradle/plugins/findbugs-android.gradle
@@ -0,0 +1,14 @@
+apply plugin: 'findbugs'
+
+check.dependsOn 'findbugs'
+task findbugs(type: FindBugs, dependsOn: ['compileDebugJava', 'compileDebugTestJava']) {
+    ignoreFailures = true
+    classes = fileTree('build/intermediates/classes/debug/') +
+            fileTree('build/intermediates/classes/test/debug/')
+    source = project.android.sourceSets.main.java.getSrcDirs() +
+            project.android.sourceSets.androidTest.java.getSrcDirs()
+    classpath = files()
+    effort = 'max'
+    includeFilter = file("$rootProject.projectDir/config/findbugs/include_filter.xml")
+    excludeFilter = file("$rootProject.projectDir/config/findbugs/exclude_filter.xml")
+}
diff --git a/k9mail-library/build.gradle b/k9mail-library/build.gradle
index ac3740679..27fcd488e 100644
--- a/k9mail-library/build.gradle
+++ b/k9mail-library/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.library'
+apply from: '../gradle/plugins/checkstyle-android.gradle'
+apply from: '../gradle/plugins/findbugs-android.gradle'
 
 repositories {
     jcenter()
diff --git a/k9mail/build.gradle b/k9mail/build.gradle
index 0eea0bdd8..8fc4877a1 100644
--- a/k9mail/build.gradle
+++ b/k9mail/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android-sdk-manager'
 apply plugin: 'com.android.application'
-apply plugin: 'checkstyle'
-apply plugin: 'findbugs'
+apply from: '../gradle/plugins/checkstyle-android.gradle'
+apply from: '../gradle/plugins/findbugs-android.gradle'
 
 repositories {
     jcenter()
@@ -64,30 +64,6 @@ android {
     }
 }
 
-check.dependsOn 'checkstyle'
-task checkstyle(type: Checkstyle) {
-    ignoreFailures = true
-    configFile file("$rootProject.projectDir/config/checkstyle/checkstyle.xml")
-
-    source = project.android.sourceSets.main.java.getSrcDirs() +
-            project.android.sourceSets.androidTest.java.getSrcDirs()
-    include '**/*.java'
-    classpath = files()
-}
-
-check.dependsOn 'findbugs'
-task findbugs(type: FindBugs, dependsOn: ['compileDebugJava', 'compileDebugTestJava']) {
-    ignoreFailures = true
-    classes = fileTree('build/intermediates/classes/debug/') +
-            fileTree('build/intermediates/classes/test/debug/')
-    source = project.android.sourceSets.main.java.getSrcDirs() +
-            project.android.sourceSets.androidTest.java.getSrcDirs()
-    classpath = files()
-    effort = 'max'
-    includeFilter = file("$rootProject.projectDir/config/findbugs/include_filter.xml")
-    excludeFilter = file("$rootProject.projectDir/config/findbugs/exclude_filter.xml")
-}
-
 if (project.hasProperty('keyAlias')) {
     android.signingConfigs.release.keyAlias = keyAlias
 }