Merge branch 'release/v3.2.1'

README.md

@@ -14,9 +14,11 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad
 
 ```javascript
 dependencies {
-	compile('com.mikepenz:actionitembadge:3.2.0@aar') {
-	    transitive = true
-	}
+	compile 'com.mikepenz:actionitembadge:3.2.1@aar'
+
+	//SUB-DEPENDENCIES
+	//Android-Iconics - used to provide an easy API for icons 
+    compile 'com.mikepenz:iconics-core:2.5.4@aar' 
 }
 ```
 
@@ -88,12 +90,13 @@ call invalidateOptionsMenu() afterwards.
 
 #Developed By
 
-* Mike Penz - http://mikepenz.com - <[email protected]>
-
+* Mike Penz 
+ * [mikepenz.com](http://mikepenz.com) - <[email protected]>
+ * [paypal.me/mikepenz](http://paypal.me/mikepenz)
 
 #License
 
-    Copyright 2015 Mike Penz
+    Copyright 2016 Mike Penz
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app/build.gradle

@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.2'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        applicationId "com.mikepenz.actionitembadge.sample"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 320
-        versionName "3.2.0"
+        versionCode 321
+        versionName "3.2.1"
     }
     buildTypes {
         release {
@@ -22,14 +21,32 @@ android {
 
 dependencies {
     compile project(':library')
-    compile('com.mikepenz:materialdrawer:4.5.4@aar') {
-        transitive = true
-        exclude module: "iconics-core"
-    }
-    compile('com.mikepenz:aboutlibraries:5.3.3@aar') {
-        transitive = true
-    }
 
+    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    compile "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
+    compile "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+
+    // used to base on some backwards compatible themes
+    // 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.5.1@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.4@aar'
+
+    //used to generate the drawer on the left
+    //https://github.com/mikepenz/MaterialDrawer
+    compile 'com.mikepenz:materialdrawer:4.6.4@aar'
+
+    //used to generate the Open Source section
+    //https://github.com/mikepenz/AboutLibraries
+    compile 'com.mikepenz:aboutlibraries:5.3.4@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'

build.gradle

@@ -1,26 +1,27 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.5.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
 
+ext {
+    compileSdkVersion = 23
+    buildToolsVersion = "23.0.2"
+    supportLibVersion = "23.1.1"
+}
+
 allprojects {
     repositories {
         jcenter()
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
 }
 
-
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.9'
+    gradleVersion = '2.10'
 }

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.0
-VERSION_CODE=320
+VERSION_NAME=3.2.1
+VERSION_CODE=321
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=Android-ActionItemBadge Library

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Dec 02 22:13:31 CET 2015
+#Mon Jan 11 23:48:03 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

library/build.gradle

@@ -1,14 +1,15 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.novoda.bintray-release'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 320
-        versionName "3.2.0"
+        versionCode 321
+        versionName "3.2.1"
     }
     buildTypes {
         release {
@@ -18,7 +19,11 @@ android {
     }
 }
 apply from: 'gradle-mvn-push.gradle'
+apply from: 'gradle-jcenter-push.gradle'
 
 dependencies {
-    compile 'com.mikepenz:iconics-core:2.5.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.4@aar'
 }

library/gradle-jcenter-push.gradle

@@ -0,0 +1,11 @@
+publish {
+    dryRun = false
+    bintrayUser = project.hasProperty('bintray.user') ? project.property('bintray.user') : System.getenv('BINTRAY_USER')
+    bintrayKey = project.hasProperty('bintray.apikey') ? project.property('bintray.apikey') : System.getenv('BINTRAY_API_KEY')
+    userOrg = project.property("POM_DEVELOPER_ID")
+    groupId = project.property("GROUP")
+    artifactId = project.property("GROUP") + ":" + project.property("POM_ARTIFACT_ID")
+    publishVersion = project.property("VERSION_NAME")
+    desc = project.property("POM_DESCRIPTION")
+    website = project.property("POM_URL")
+}

library/src/main/res/values/aboutlibraries.xml

@@ -9,12 +9,12 @@
         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.0</string>
+    <string name="library_AndroidActionItemBadge_libraryVersion">3.2.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>
     <string name="library_AndroidActionItemBadge_repositoryLink">https://github.com/mikepenz/Android-ActionItemBadge</string>
     <!-- Custom variables section -->
     <string name="library_AndroidActionItemBadge_owner">Mike Penz</string>
-    <string name="library_AndroidActionItemBadge_year">2014</string>
+    <string name="library_AndroidActionItemBadge_year">2016</string>
 </resources>