From 8e62cc103e04170c9e8334fb6a70f8f95b5f33fe Mon Sep 17 00:00:00 2001
From: pfavre <patrick.favre@rise-world.com>
Date: Tue, 31 Jan 2017 13:49:53 +0100
Subject: [PATCH] updates support lib to 25.1.1 refactors support lib
 dependency versioning updates version to v0.3.4

---
 CHANGELOG         |  3 +++
 README.md         |  2 +-
 app/build.gradle  |  7 +++----
 build.gradle      | 15 ++++++++++++++-
 dali/build.gradle |  4 ++--
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 94b9827..a68302f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Releases
 
+## v0.3.4
+* updates support lib version to 25.1.1
+
 ## v0.3.3
 * fixes build script to auto upload to maven central
 * fixes gradle git command to get commit date
diff --git a/README.md b/README.md
index ad3be41..90817ec 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Add the following to your dependencies  ([add jcenter to your repositories](http
 
 ```gradle
    dependencies {
-        compile 'at.favre.lib:dali:0.3.3'
+        compile 'at.favre.lib:dali:0.3.4'
    }
 ```
 
diff --git a/app/build.gradle b/app/build.gradle
index b678a61..c4ce719 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,11 +63,10 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile "com.android.support:appcompat-v7:$rootProject.ext.dependencies.support"
     compile 'com.squareup.picasso:picasso:2.5.2'
 
-    compile 'at.favre.lib:dali:0.3.1'
-    compile 'at.favre.lib.hood:hood-extended:0.4.1'
+    compile 'at.favre.lib:dali:0.3.+'
+    compile 'at.favre.lib.hood:hood-extended:0.4.+'
 //    compile project(path: ':dali')
 }
diff --git a/build.gradle b/build.gradle
index 4cdf757..763aca9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,11 +22,24 @@ allprojects {
 apply from: "$rootDir/gradle/common-build.gradle"
 
 ext {
-    versionName = "0.3.3"
+    versionName = "0.3.4"
     versionCode = getCiBuildNumber()
     compileSdkVersion = 25
     buildToolsVersion = "25.0.2"
     targetSdkVersion = 24
     minSdkVersion = 10
     renderscriptTargetApi = 20
+
+    dependencies = [
+            support: "25.1.1"
+    ]
 }
+
+configurations.all {
+    resolutionStrategy {
+        force group: 'com.android.support', name: 'support-v4', version: rootProject.ext.dependencies.support
+        force group: 'com.android.support', name: 'appcompat-v7', version: rootProject.ext.dependencies.support
+        force group: 'com.android.support', name: 'support-annotations', version: rootProject.ext.dependencies.support
+        force group: 'com.android.support', name: 'recyclerview', version: rootProject.ext.dependencies.support
+    }
+}
\ No newline at end of file
diff --git a/dali/build.gradle b/dali/build.gradle
index dbfb649..b2b197e 100644
--- a/dali/build.gradle
+++ b/dali/build.gradle
@@ -55,8 +55,8 @@ android {
 
 dependencies {
     compile 'com.jakewharton:disklrucache:2.0.2'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:recyclerview-v7:25.1.0'
+    compile "com.android.support:appcompat-v7:$rootProject.ext.dependencies.support"
+    compile "com.android.support:recyclerview-v7:$rootProject.ext.dependencies.support"
 }
 
 apply from: "$rootDir/gradle/publish.gradle"
\ No newline at end of file