From 5f2e3a5e1d64e4e2c40d8c44a817a05d946f7fa2 Mon Sep 17 00:00:00 2001
From: Branden Archer <Branden Archer b.m.archer4@gmail.com>
Date: Sat, 20 Feb 2016 13:30:37 -0500
Subject: [PATCH 1/3] Change inner class to be static

---
 app/src/main/java/protect/card_locker/DBHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java
index 6d2890b4f..9e51043f2 100644
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -12,7 +12,7 @@ public class DBHelper extends SQLiteOpenHelper
     public static final String DATABASE_NAME = "LoyaltyCards.db";
     public static final int DATABASE_VERSION = 1;
 
-    class LoyaltyCardDbIds
+    static class LoyaltyCardDbIds
     {
         public static final String TABLE = "cards";
         public static final String ID = "_id";

From 0289720c093c1a0e61b6461971fd5a4189c08544 Mon Sep 17 00:00:00 2001
From: Branden Archer <Branden Archer b.m.archer4@gmail.com>
Date: Sat, 20 Feb 2016 13:46:53 -0500
Subject: [PATCH 2/3] enable findbugs during travis-ci build

---
 .travis.yml                     |  3 ++-
 app/build.gradle                | 25 +++++++++++++++++++++++++
 app/config/findbugs/exclude.xml | 10 ++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 app/config/findbugs/exclude.xml

diff --git a/.travis.yml b/.travis.yml
index a215383b5..19561380f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,8 @@ android:
     # if you need to run emulator(s) during your tests
     - sys-img-x86-android-17
 
-script: gradle build lint test
+script: gradle build lint findbugs test
 
 after_failure:
 - cat app/build/outputs/lint-results.xml
+- cat app/build/reports/findbugs/findbugs.html
diff --git a/app/build.gradle b/app/build.gradle
index e45392fa4..5fa45db05 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,10 @@
 apply plugin: 'com.android.application'
+apply plugin: 'findbugs'
+
+findbugs {
+    sourceSets = []
+    ignoreFailures = false
+}
 
 android {
     compileSdkVersion 23
@@ -36,3 +42,22 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile "org.robolectric:robolectric:3.0"
 }
+
+task findbugs(type: FindBugs, dependsOn: assembleDebug) {
+
+    description 'Run findbugs'
+    group 'verification'
+
+    classes = fileTree('build/intermediates/classes/debug/')
+    source = fileTree('src/main/java')
+    classpath = files()
+
+    effort = 'max'
+
+    excludeFilter = file("./config/findbugs/exclude.xml")
+
+    reports {
+        xml.enabled = false
+        html.enabled = true
+    }
+}
\ No newline at end of file
diff --git a/app/config/findbugs/exclude.xml b/app/config/findbugs/exclude.xml
new file mode 100644
index 000000000..8f7997b7c
--- /dev/null
+++ b/app/config/findbugs/exclude.xml
@@ -0,0 +1,10 @@
+<FindBugsFilter>
+
+    <Match>
+        <Class name="~.*R\$.*"/>
+    </Match>
+    <Match>
+        <Class name="~.*Manifest\$.*"/>
+    </Match>
+
+</FindBugsFilter>

From eb61f81b5275255c58b2f8d23d27524d3b2e4162 Mon Sep 17 00:00:00 2001
From: Branden Archer <Branden Archer b.m.archer4@gmail.com>
Date: Sat, 20 Feb 2016 13:47:30 -0500
Subject: [PATCH 3/3] cat unit test failure report if failures found

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 19561380f..d3aa2b9d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,3 +24,4 @@ script: gradle build lint findbugs test
 after_failure:
 - cat app/build/outputs/lint-results.xml
 - cat app/build/reports/findbugs/findbugs.html
+- cat app/build/reports/tests/debug/index.html