From 9ee78a0b1ccd9e2d5bccc5700fc4ef0d03a6bda2 Mon Sep 17 00:00:00 2001 From: DanPrado Date: Thu, 13 Aug 2015 15:14:43 -0300 Subject: [PATCH 1/3] Removing unnecessary type conversion badgeCount in last update() method is a string, so there's no need to call String.valueOf(badgeCount); --- .../com/mikepenz/actionitembadge/library/ActionItemBadge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/mikepenz/actionitembadge/library/ActionItemBadge.java b/library/src/main/java/com/mikepenz/actionitembadge/library/ActionItemBadge.java index 8fa4c05..a9b4035 100644 --- 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); From 10d4378bd70f8372b985fd3fc12fe2667f5eec2a Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 21 Aug 2015 13:46:39 +0200 Subject: [PATCH 2/3] * update to the latest support lib * update to the latest bulid tools * update to the latest compile and target version * update to the latest gradle wrapper * update some dependencies --- app/build.gradle | 11 ++++++----- build.gradle | 2 +- library/build.gradle | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fd18170..9c5beea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ 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 + targetSdkVersion 23 versionCode 310 versionName "3.1.0" } @@ -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 index f0c8f86..49c4458 100644 --- 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/library/build.gradle b/library/build.gradle index eeea05a..d25bdae 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 23 + buildToolsVersion "23" defaultConfig { minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 23 versionCode 310 versionName "3.1.0" } @@ -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' } From fe2f985aff1739f0b3e3df14cae1e42ea3475774 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 21 Aug 2015 13:47:26 +0200 Subject: [PATCH 3/3] * [release] v3.1.1 --- README.md | 2 +- app/build.gradle | 4 ++-- gradle.properties | 4 ++-- library/build.gradle | 4 ++-- library/src/main/res/values/aboutlibraries.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ff7fc4d..dd816a9 100644 --- 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 index 9c5beea..3d72575 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.mikepenz.actionitembadge.sample" minSdkVersion 14 targetSdkVersion 23 - versionCode 310 - versionName "3.1.0" + versionCode 311 + versionName "3.1.1" } buildTypes { release { diff --git a/gradle.properties b/gradle.properties index 7846212..7587d7e 100644 --- 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 index d25bdae..018c955 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 310 - versionName "3.1.0" + versionCode 311 + versionName "3.1.1" } buildTypes { release { diff --git a/library/src/main/res/values/aboutlibraries.xml b/library/src/main/res/values/aboutlibraries.xml index c6b0ec8..b6a91ee 100644 --- a/library/src/main/res/values/aboutlibraries.xml +++ b/library/src/main/res/values/aboutlibraries.xml @@ -9,7 +9,7 @@ Android-ActionItemBadge is a library which offers a simple and easy to use method to add a badge to your action item!! ]]> - 3.1.0 + 3.1.1 https://github.com/mikepenz/Android-ActionItemBadge apache_2_0 true