Merge pull request #8 from BryceCicada/develop

Develop
BryceCicada · Jul 15, 2014 · 4a42411 · 4a42411
2 parents 6f27c41 + bb1118a
commit 4a42411
Show file tree

Hide file tree

Showing 70 changed files with 750 additions and 366 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ build/
 .gradle
 local.properties
 /wrapper
+gradle.properties
diff --git a/AndroidLibrary/build.gradle b/AndroidLibrary/build.gradle
@@ -16,7 +16,7 @@ repositories {
 }
 
 group = 'ninja.ugly'
-version = '0.2.3'
+version = prevail_version
 ext.artifact = 'android-prevail'
 
 signing {
@@ -47,7 +47,7 @@ android {
     buildToolsVersion '19.1.0'
     defaultConfig {
         applicationId 'ninja.ugly.prevail'
-        minSdkVersion 17
+        minSdkVersion 15
         targetSdkVersion 19
         versionCode 1
         versionName project.version
@@ -61,9 +61,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:19.+'
-    compile 'ninja.ugly:prevail:0.2.3'
+    compile 'ninja.ugly:prevail:' + prevail_version
 }
 
 uploadArchives {

diff --git a/Library/build.gradle b/Library/build.gradle
@@ -6,8 +6,8 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 group = 'ninja.ugly'
-version = '0.2.3'
-ext.artifact= 'prevail'
+version = prevail_version
+ext.artifact = 'prevail'
 
 buildscript {
     dependencies {
@@ -92,10 +92,10 @@ dependencies {
     testCompile 'com.google.guava:guava:16.0.1'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
     testCompile("junit:junit:4.11") {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core-1.1'
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
     }
     testCompile('org.mockito:mockito-core:1.9.5') {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core-1.1'
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
     }
 }