Merge branch 'release/v3.1.5'

mikepenz · Nov 5, 2015 · 30675f6 · 30675f6
2 parents d40e112 + 47410ce
commit 30675f6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 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.4@aar') {
+	compile('com.mikepenz:actionitembadge:3.1.5@aar') {
 	    transitive = true
 	}
 }

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.mikepenz.actionitembadge.sample"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 314
-        versionName "3.1.4"
+        versionCode 315
+        versionName "3.1.5"
     }
     buildTypes {
         release {
@@ -22,15 +22,15 @@ android {
 
 dependencies {
     compile project(':library')
-    compile('com.mikepenz:materialdrawer:4.4.4@aar') {
+    compile('com.mikepenz:materialdrawer:4.4.5@aar') {
         transitive = true
         exclude module: "iconics-core"
     }
-    compile('com.mikepenz:aboutlibraries:5.3.0@aar') {
+    compile('com.mikepenz:aboutlibraries:5.3.2@aar') {
         transitive = true
     }
 
     compile 'com.mikepenz:google-material-typeface:2.1.2.1@aar'
     compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar'
-    compile 'com.mikepenz:crossfader:1.1.3@aar'
+    compile 'com.mikepenz:crossfader:1.2.0@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.1.4
-VERSION_CODE=314
+VERSION_NAME=3.1.5
+VERSION_CODE=315
 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 23
-        versionCode 314
-        versionName "3.1.4"
+        versionCode 315
+        versionName "3.1.5"
     }
     buildTypes {
         release {
@@ -20,5 +20,5 @@ android {
 apply from: 'gradle-mvn-push.gradle'
 
 dependencies {
-    compile 'com.mikepenz:iconics-core:2.0.0@aar'
+    compile 'com.mikepenz:iconics-core:2.1.0@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.1.4</string>
+    <string name="library_AndroidActionItemBadge_libraryVersion">3.1.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>