Merge branch 'release/v1.2.4'

mikepenz · Mar 11, 2016 · 969b5f5 · 969b5f5
2 parents 1e54c0f + 443c9f3
commit 969b5f5
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -40,14 +40,14 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details
 
 The library is split up into core, and extensions. The core functions are included in the following dependency.
 ```gradle
-compile('com.mikepenz:fastadapter:1.2.3@aar') {
+compile('com.mikepenz:fastadapter:1.2.4@aar') {
 	transitive = true
 }
 ```
 
 All additions are included in the following dependency.
 ```gradle
-compile 'com.mikepenz:fastadapter-extensions:1.2.3@aar'
+compile 'com.mikepenz:fastadapter-extensions:1.2.4@aar'
 ```
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 123
-        versionName '1.2.3'
+        versionCode 124
+        versionName '1.2.4'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->
@@ -56,22 +56,22 @@ dependencies {
     // contains util classes to support various android versions, and clean up code
     // comes with the awesome "Holder"-Pattern
     // https://github.com/mikepenz/Materialize
-    compile 'com.mikepenz:materialize:0.8.5@aar'
+    compile 'com.mikepenz:materialize:0.8.6@aar'
 
     // used to provide out of the box icon font support. simplifies development,
     // and provides scalable icons. the core is very very light
     // https://github.com/mikepenz/Android-Iconics
-    compile 'com.mikepenz:iconics-core:2.5.8@aar'
+    compile 'com.mikepenz:iconics-core:2.5.9@aar'
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile('com.mikepenz:materialdrawer:5.0.9@aar') {
+    compile('com.mikepenz:materialdrawer:5.1.2@aar') {
         transitive = true
         exclude module: "fastadapter"
     }
     //used to provide different itemAnimators for the RecyclerView
     //https://github.com/mikepenz/ItemAnimators
-    compile 'com.mikepenz:itemanimators:0.2.2@aar'
+    compile 'com.mikepenz:itemanimators:0.2.3@aar'
     //used to generate the Open Source section
     //https://github.com/mikepenz/AboutLibraries
     compile('com.mikepenz:aboutlibraries:5.5.7@aar') {

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
@@ -15,7 +15,7 @@ buildscript {
 ext {
     compileSdkVersion = 23
     buildToolsVersion = "23.0.2"
-    supportLibVersion = "23.2.0"
+    supportLibVersion = "23.2.1"
 }
 
 allprojects {

diff --git a/library-extensions/build.gradle b/library-extensions/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 123
-        versionName '1.2.3'
+        versionCode 124
+        versionName '1.2.4'
     }
     buildTypes {
         release {

diff --git a/library-extensions/gradle.properties b/library-extensions/gradle.properties
@@ -2,5 +2,5 @@ POM_NAME=FastAdapter Library-Extensions
 POM_ARTIFACT_ID=fastadapter-extensions
 POM_PACKAGING=aar
 
-VERSION_NAME=1.2.3
-VERSION_CODE=123
+VERSION_NAME=1.2.4
+VERSION_CODE=124
diff --git a/library/build.gradle b/library/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 123
-        versionName '1.2.3'
+        versionCode 124
+        versionName '1.2.4'
     }
     buildTypes {
         release {

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -2,5 +2,5 @@ POM_NAME=FastAdapter Library
 POM_ARTIFACT_ID=fastadapter
 POM_PACKAGING=aar
 
-VERSION_NAME=1.2.3
-VERSION_CODE=123
+VERSION_NAME=1.2.4
+VERSION_CODE=124
diff --git a/library/src/main/res/values/library_fastadapter_strings.xml b/library/src/main/res/values/library_fastadapter_strings.xml
@@ -10,7 +10,7 @@
         <b>FastAdapter</b>, the bullet proof, fast and easy to use adapter library, which minimizes developing time to a fraction...
         ]]>
     </string>
-    <string name="library_fastadapter_libraryVersion">1.2.3</string>
+    <string name="library_fastadapter_libraryVersion">1.2.4</string>
     <string name="library_fastadapter_libraryWebsite">https://github.com/mikepenz/FastAdapter</string>
     <string name="library_fastadapter_licenseId">apache_2_0</string>
     <string name="library_fastadapter_isOpenSource">true</string>