Merge branch 'release/v3.2.3'

mikepenz · Mar 11, 2016 · 82d2c0c · 82d2c0c
2 parents f64d6ac + 5eb0181
commit 82d2c0c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,11 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad
 
 ```javascript
 dependencies {
-	compile 'com.mikepenz:actionitembadge:3.2.2@aar'
+	compile 'com.mikepenz:actionitembadge:3.2.3@aar'
 
 	//SUB-DEPENDENCIES
 	//Android-Iconics - used to provide an easy API for icons 
-    compile 'com.mikepenz:iconics-core:2.5.5@aar' 
+    compile 'com.mikepenz:iconics-core:2.5.8@aar' 
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 322
-        versionName "3.2.2"
+        versionCode 323
+        versionName "3.2.3"
     }
     buildTypes {
         release {
@@ -30,24 +30,29 @@ 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.6.0@aar'
+    compile 'com.mikepenz:materialize:0.8.6@aar'
+
+    // used to fill the RecyclerView with the DrawerItems
+    // and provides single and multi selection, expandable items
+    // https://github.com/mikepenz/FastAdapter
+    compile 'com.mikepenz:fastadapter:1.2.4@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.5@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:4.6.4@aar'
+    compile 'com.mikepenz:materialdrawer:5.1.2@aar'
 
     //used to generate the Open Source section
     //https://github.com/mikepenz/AboutLibraries
-    compile 'com.mikepenz:aboutlibraries:5.3.7@aar'
+    compile 'com.mikepenz:aboutlibraries:5.5.8@aar'
 
     //used to display the icons in the drawer and in the menu
     //https://github.com/mikepenz/Android-Iconics
     compile 'com.mikepenz:google-material-typeface:2.2.0.1@aar'
     compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar'
-    compile 'com.mikepenz:crossfader:1.3.2@aar'
+    compile 'com.mikepenz:crossfader:1.3.6@aar'
 }
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 ext {
     compileSdkVersion = 23
     buildToolsVersion = "23.0.2"
-    supportLibVersion = "23.1.1"
+    supportLibVersion = "23.2.1"
 }
 
 allprojects {
@@ -23,5 +23,5 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.10'
+    gradleVersion = '2.11'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=3.2.2
-VERSION_CODE=322
+VERSION_NAME=3.2.3
+VERSION_CODE=323
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=Android-ActionItemBadge Library

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 11 23:48:03 CET 2016
+#Fri Mar 11 16:39:35 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 322
-        versionName "3.2.2"
+        versionCode 323
+        versionName "3.2.3"
     }
     buildTypes {
         release {
@@ -25,5 +25,5 @@ dependencies {
     // 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.5@aar'
+    compile 'com.mikepenz:iconics-core:2.5.9@aar'
 }
diff --git a/library/src/main/res/values/aboutlibraries.xml b/library/src/main/res/values/aboutlibraries.xml
@@ -9,7 +9,7 @@
         Android-<b>ActionItemBadge</b> is a library which offers a simple and easy to use method to add a badge to your action item!!
         ]]>
     </string>
-    <string name="library_AndroidActionItemBadge_libraryVersion">3.2.2</string>
+    <string name="library_AndroidActionItemBadge_libraryVersion">3.2.3</string>
     <string name="library_AndroidActionItemBadge_libraryWebsite">https://github.com/mikepenz/Android-ActionItemBadge</string>
     <string name="library_AndroidActionItemBadge_licenseId">apache_2_0</string>
     <string name="library_AndroidActionItemBadge_isOpenSource">true</string>