Merge branch 'release/v3.1.2'

mikepenz · Sep 6, 2015 · 9b97c1c · 9b97c1c
2 parents e5be2e8 + 8eef77b
commit 9b97c1c
Show file tree

Hide file tree

Showing 7 changed files with 19 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.1@aar') {
+	compile('com.mikepenz:actionitembadge:3.1.2@aar') {
 	    transitive = true
 	}
 }

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23'
+    buildToolsVersion '23.0.1'
 
     defaultConfig {
         applicationId "com.mikepenz.actionitembadge.sample"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 311
-        versionName "3.1.1"
+        versionCode 312
+        versionName "3.1.2"
     }
     buildTypes {
         release {
@@ -22,15 +22,15 @@ android {
 
 dependencies {
     compile project(':library')
-    compile('com.mikepenz:materialdrawer:4.0.0.rc11-SNAPSHOT@aar') {
+    compile('com.mikepenz:materialdrawer:4.0.5@aar') {
         transitive = true
         exclude module: "iconics-core"
     }
-    compile('com.mikepenz:aboutlibraries:5.2.0@aar') {
+    compile('com.mikepenz:aboutlibraries:5.2.1@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:google-material-typeface:1.2.0.1@aar'
+    compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@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.3.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,5 +22,5 @@ allprojects {
 
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.5'
+    gradleVersion = '2.6'
 }
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.1
-VERSION_CODE=311
+VERSION_NAME=3.1.2
+VERSION_CODE=312
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=Android-ActionItemBadge Library

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 19 20:37:24 CEST 2015
+#Sun Sep 06 21:48:00 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23"
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 311
-        versionName "3.1.1"
+        versionCode 312
+        versionName "3.1.2"
     }
     buildTypes {
         release {
@@ -20,5 +20,5 @@ android {
 apply from: 'gradle-mvn-push.gradle'
 
 dependencies {
-    compile 'com.mikepenz:iconics-core:1.7.2@aar'
+    compile 'com.mikepenz:iconics-core:1.7.6@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.1</string>
+    <string name="library_AndroidActionItemBadge_libraryVersion">3.1.2</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>