Merge branch 'release/v3.2.5'

mikepenz · Apr 7, 2016 · ada241d · ada241d
2 parents 6678332 + 660697d
commit ada241d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 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.4@aar'
+	compile 'com.mikepenz:actionitembadge:3.2.5@aar'
 
 	//SUB-DEPENDENCIES
 	//Android-Iconics - used to provide an easy API for icons 
-    compile 'com.mikepenz:iconics-core:2.5.10@aar'
+    compile 'com.mikepenz:iconics-core:2.5.11@aar'
 }
 ```
 
@@ -40,7 +40,7 @@ It is also a good idea to set showAsAction="always" (The badge can only be shown
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/item_samplebadge"
-        app:actionLayout="@layout/menu_badge"
+        app:actionLayout="@layout/menu_action_item_badge"
         app:showAsAction="always"
         android:title="@string/sample_1"/>
 </menu>

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 324
-        versionName "3.2.4"
+        versionCode 325
+        versionName "3.2.5"
     }
     buildTypes {
         release {
@@ -30,29 +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.8.6@aar'
+    compile 'com.mikepenz:materialize:0.8.8@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.5@aar'
+    compile 'com.mikepenz:fastadapter:1.4.0@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.10@aar'
+    compile 'com.mikepenz:iconics-core:2.5.11@aar'
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile 'com.mikepenz:materialdrawer:5.1.4@aar'
+    compile 'com.mikepenz:materialdrawer:5.1.8@aar'
 
     //used to generate the Open Source section
     //https://github.com/mikepenz/AboutLibraries
-    compile 'com.mikepenz:aboutlibraries:5.5.9@aar'
+    compile 'com.mikepenz:aboutlibraries:5.6.3@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.6@aar'
+    compile 'com.mikepenz:crossfader:1.3.7@aar'
 }
diff --git a/build.gradle b/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
 
 ext {
     compileSdkVersion = 23
-    buildToolsVersion = "23.0.2"
-    supportLibVersion = "23.2.1"
+    buildToolsVersion = "23.0.3"
+    supportLibVersion = "23.3.0"
 }
 
 allprojects {

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.4
-VERSION_CODE=324
+VERSION_NAME=3.2.5
+VERSION_CODE=325
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=Android-ActionItemBadge Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 324
-        versionName "3.2.4"
+        versionCode 325
+        versionName "3.2.5"
     }
     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.10@aar'
+    compile 'com.mikepenz:iconics-core:2.5.11@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.4</string>
+    <string name="library_AndroidActionItemBadge_libraryVersion">3.2.5</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>