Merge branch 'release/v3.1.1'

mikepenz · Aug 21, 2015 · e5be2e8 · e5be2e8
2 parents e4831e6 + fe2f985
commit e5be2e8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad
 
 ```javascript
 dependencies {
-	compile('com.mikepenz:actionitembadge:3.1.0@aar') {
+	compile('com.mikepenz:actionitembadge:3.1.1@aar') {
 	    transitive = true
 	}
 }

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion 23
+    buildToolsVersion '23'
 
     defaultConfig {
         applicationId "com.mikepenz.actionitembadge.sample"
         minSdkVersion 14
-        targetSdkVersion 22
-        versionCode 310
-        versionName "3.1.0"
+        targetSdkVersion 23
+        versionCode 311
+        versionName "3.1.1"
     }
     buildTypes {
         release {
@@ -22,14 +22,15 @@ android {
 
 dependencies {
     compile project(':library')
-    compile('com.mikepenz:materialdrawer:4.0.0.rc7-SNAPSHOT@aar') {
+    compile('com.mikepenz:materialdrawer:4.0.0.rc11-SNAPSHOT@aar') {
         transitive = true
         exclude module: "iconics-core"
     }
-    compile('com.mikepenz:aboutlibraries:5.1.1@aar') {
+    compile('com.mikepenz:aboutlibraries:5.2.0@aar') {
         transitive = true
     }
 
     compile 'com.mikepenz:google-material-typeface:1.2.0@aar'
     compile 'com.mikepenz:fontawesome-typeface:4.4.0@aar'
+    compile 'com.mikepenz:crossfader:1.0.1@aar'
 }
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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.1.0
-VERSION_CODE=310
+VERSION_NAME=3.1.1
+VERSION_CODE=311
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=Android-ActionItemBadge Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
-        versionCode 310
-        versionName "3.1.0"
+        targetSdkVersion 23
+        versionCode 311
+        versionName "3.1.1"
     }
     buildTypes {
         release {
@@ -20,5 +20,5 @@ android {
 apply from: 'gradle-mvn-push.gradle'
 
 dependencies {
-    compile 'com.mikepenz:iconics-core:1.7.1@aar'
+    compile 'com.mikepenz:iconics-core:1.7.2@aar'
 }
diff --git a/library/src/main/java/com/mikepenz/actionitembadge/library/ActionItemBadge.java b/library/src/main/java/com/mikepenz/actionitembadge/library/ActionItemBadge.java
@@ -206,7 +206,7 @@ public boolean onLongClick(View v) {
             badgeView.setVisibility(View.GONE);
         } else {
             badgeView.setVisibility(View.VISIBLE);
-            badgeView.setText(String.valueOf(badgeCount));
+            badgeView.setText(badgeCount);
         }
 
         menu.setVisible(true);

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.1.0</string>
+    <string name="library_AndroidActionItemBadge_libraryVersion">3.1.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>