Merge branch 'master' into develop

CHANGE.md

@@ -1,5 +1,15 @@
 ## v1.0.2 - 04/30/2016
 
+#####Update README.md
+commit cd98623b74763e4d12a0c682b5023fdd5f169d91<br/>
+Author: Patches <[email protected]><br/>
+Date:   Sat Apr 30 15:02:43 2016 -0500
+
+#####Update CHANGE.md
+commit af298c3a986c4418cf0003e33f9d591daec58dc5<br/>
+Author: Patches <[email protected]><br/>
+Date:   Sat Apr 30 14:54:13 2016 -0500
+
 #####Create CHANGE.md
 commit c16118744ff2a52881c4af6f4afc8438262888c8<br/>
 Author: Patches <[email protected]><br/>

app/build.gradle

@@ -24,7 +24,7 @@ task jacocoDebugTestReport(type: JacocoReport, dependsOn: ["connectedDebugAndroi
     classDirectories = classDirs
     additionalSourceDirs = files(coverageSourceDirs)
     sourceDirectories = files(coverageSourceDirs)
-    executionData = files(['build/outputs/code-coverage/connected/coverage.ec'])
+    executionData = files([fileTree(dir: 'build/outputs/code-coverage/connected', include: '**/*.ec')])
 
     onlyIf = {
         true
@@ -46,14 +46,22 @@ dexcount {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+
+    testOptions {
+        // Allows Android code to be called from unit tests without causing a crash.
+        // Helpful for allowing Log.d()-type calls
+        unitTests.returnDefaultValues = true;
+    }
+
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 3
         versionName "1.0.2"
+        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -72,12 +80,13 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.3.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    androidTestCompile 'com.android.support:support-annotations:24.2.1'
 
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'org.mockito:mockito-core:1.10.19'
     androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.5.4'
 
     testCompile 'junit:junit:4.12'
 }