Merge pull request #19 from percolate/use_jitpack

Convert caffeine to use jitpack for distribution

README.md

@@ -3,6 +3,7 @@
 
 A collection of utility classes that help make Android development faster (and safer!)
 
+
 ## Examples
 
 No more unsafe type casting scattered throughout your code:
@@ -21,30 +22,17 @@ DialogUtils.quickDialog(this, "Some awesome message");
 ToastUtils.quickToast(this, "Some toast message");
 ```
 
-
-
 [And much more!](http://percolate.github.io/caffeine/javadoc/)
 
 
 ## Adding to your application
 
- - As a [.jar](https://github.com/percolate/caffeine/tree/master/distribution) file
+See https://jitpack.io/com/github/percolate/caffeine/
 
- - Using gradle
 
-```groovy
-compile 'com.percolate:caffeine:0.3.3'
-```
+## Running Tests
 
- - Using Maven
-
-```xml
-<dependency>
-  <groupId>com.percolate</groupId>
-  <artifactId>caffeine</artifactId>
-  <version>0.3.3</version>
-</dependency>
-```
+`./gradlew clean test:connectedAndroidTest`
 
 
 ## License

build.gradle

@@ -6,9 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.5.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 

caffeine/build.gradle

@@ -1,38 +1,69 @@
 apply plugin: 'com.android.library'
+apply plugin: 'jacoco'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group 'com.percolate.caffeine'
+version '1.0-SNAPSHOT'
 
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
 
+    buildTypes {
+        debug {
+            testCoverageEnabled false
+        }
+    }
+
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 33
-        versionName "0.3.3"
+        versionCode 40
+        versionName "0.4.0"
     }
 
-    sourceSets {
-        main  {
-            java {
-                srcDir 'src/main/java'
-            }
-        }
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/DEPENDENCIES'
     }
 }
 
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+repositories {
+    mavenCentral()
 }
 
-task jar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
+jacoco {
+    version = '0.7.5.201505241946'
 }
 
-task makeJar(type: Copy) {
-    from('build/intermediates/bundles/release/')
-    into('../distribution')
-    include('classes.jar')
-    rename ('classes.jar', 'caffeine-' + android.defaultConfig.versionName + ".jar")
+task coverage(type:JacocoReport, dependsOn: "testDebugUnitTest") {
+    group = "Reporting"
+    description = 'Create code coverage report for android module'
+
+    classDirectories = fileTree(
+            dir: "$buildDir/intermediates/classes/debug",
+            excludes: ['**/R.class',
+                       '**/R$*.class',
+                       '**/BuildConfig.*',
+                       '**/Manifest*.*']
+    )
+
+    sourceDirectories = files("src/main/java")
+    executionData = files("build/jacoco/testDebugUnitTest.exec")
+
+    reports {
+        //noinspection GroovyAssignabilityCheck
+        xml {
+            enabled = true
+            destination = "build/jacocoAndroidTests.xml"
+        }
+        html.enabled = true
+    }
 }
 
-makeJar.dependsOn(build)
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}