Merge branch 'release/v3.0.1'

mikepenz · Jul 11, 2015 · a496027 · a496027
2 parents 21b7c68 + a5c9530
commit a496027
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 19 deletions.
diff --git a/DEV/screenshot/screenshot1.png b/DEV/screenshot/screenshot1.png
diff --git a/DEV/screenshot/screenshot1_small.png b/DEV/screenshot/screenshot1_small.png
diff --git a/DEV/screenshot/screenshot2.png b/DEV/screenshot/screenshot2.png
diff --git a/DEV/screenshot/screenshot2_small.png b/DEV/screenshot/screenshot2_small.png
diff --git a/README.md b/README.md
@@ -5,28 +5,21 @@
 ActionItemBadge is a library which offers a simple and easy to use method to add a badge to your action item!
 
 ##Screenshots
-![Image](https://raw.githubusercontent.com/mikepenz/Android-ActionItemBadge/master/DEV/screenshot/screenshot1_small.png).
-![Image](https://raw.githubusercontent.com/mikepenz/Android-ActionItemBadge/master/DEV/screenshot/screenshot2_small.png)
+![Image](https://raw.githubusercontent.com/mikepenz/Android-ActionItemBadge/develop/DEV/screenshot/screenshot1_small.png)
+![Image](https://raw.githubusercontent.com/mikepenz/Android-ActionItemBadge/develop/DEV/screenshot/screenshot2_small.png)
 
 ##Include in your project
 ###Using Maven
 The ActionItemBadge Library is pushed to [Maven Central], so you just need to add the following dependency to your `build.gradle`.
 
 ```javascript
 dependencies {
-	compile('com.mikepenz:actionitembadge:3.0.0@aar') {
+	compile('com.mikepenz:actionitembadge:3.0.1@aar') {
 	    transitive = true
 	}
 }
 ```
 
-If you want to use this library with the old ActionBar. Do the following.
-```javascript
-dependencies {
-	compile 'com.tundem.actionitembadge:library:1.2.0@aar'
-}
-```
-
 ##UPGRADE NOTES
 ####< 3.0.0
 - If you come from a version prior 3.0.0 you will have to rename some classes, and the default styles also found a new place. Just check out the updated sample app for all the changes.

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.mikepenz.actionitembadge.sample"
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 300
-        versionName "3.0.0"
+        versionCode 301
+        versionName "3.0.1"
     }
     buildTypes {
         release {
@@ -22,7 +22,7 @@ android {
 
 dependencies {
     compile project(':library')
-    compile('com.mikepenz:materialdrawer:3.0.9@aar') {
+    compile('com.mikepenz:materialdrawer:3.1.2@aar') {
         transitive = true
     }
     compile('com.mikepenz:aboutlibraries:5.0.6@aar') {

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.0.0
-VERSION_CODE=300
+VERSION_NAME=3.0.1
+VERSION_CODE=301
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=Android-ActionItemBadge Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 300
-        versionName "3.0.0"
+        versionCode 301
+        versionName "3.0.1"
     }
     buildTypes {
         release {
@@ -20,5 +20,5 @@ android {
 apply from: 'gradle-mvn-push.gradle'
 
 dependencies {
-    compile 'com.mikepenz:iconics:1.2.0'
+    compile 'com.mikepenz:iconics:1.2.1'
 }
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.0.0</string>
+    <string name="library_AndroidActionItemBadge_libraryVersion">3.0.1</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>