diff --git a/README.md b/README.md index 548b291..88c2401 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.9@aar') { + compile('com.mikepenz:actionitembadge:3.2.0@aar') { transitive = true } } diff --git a/app/build.gradle b/app/build.gradle index 80c44ad..a1dcf72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.mikepenz.actionitembadge.sample" minSdkVersion 14 targetSdkVersion 23 - versionCode 319 - versionName "3.1.9" + versionCode 320 + versionName "3.2.0" } buildTypes { release { @@ -22,7 +22,7 @@ android { dependencies { compile project(':library') - compile('com.mikepenz:materialdrawer:4.4.7@aar') { + compile('com.mikepenz:materialdrawer:4.5.4@aar') { transitive = true exclude module: "iconics-core" } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index fd0afb2..5b1bcf8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,11 +1,11 @@ + android:layout_width="match_parent" + android:layout_height="match_parent"> + - + android:layout_height="match_parent"> \ No newline at end of file diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index d66cfed..11fbcf8 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -1,17 +1,18 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:context=".MainActivity"> + android:title="@string/sample_1" /> + app:showAsAction="always" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index e139969..aafeb12 100644 --- a/build.gradle +++ b/build.gradle @@ -22,5 +22,5 @@ allprojects { task wrapper(type: Wrapper) { - gradleVersion = '2.8' + gradleVersion = '2.9' } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6869c03..8eae330 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.9 -VERSION_CODE=319 +VERSION_NAME=3.2.0 +VERSION_CODE=320 GROUP=com.mikepenz POM_DESCRIPTION=Android-ActionItemBadge Library diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 62d11e7..c93ac44 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Nov 03 22:42:03 CET 2015 +#Wed Dec 02 22:13:31 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip diff --git a/library/build.gradle b/library/build.gradle index c6e93dc..154470f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 319 - versionName "3.1.9" + versionCode 320 + versionName "3.2.0" } buildTypes { release { @@ -20,5 +20,5 @@ android { apply from: 'gradle-mvn-push.gradle' dependencies { - compile 'com.mikepenz:iconics-core:2.2.0@aar' + compile 'com.mikepenz:iconics-core:2.5.0@aar' } diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index c981bd3..0581bf5 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,4 +1,3 @@ - + diff --git a/library/src/main/res/values/aboutlibraries.xml b/library/src/main/res/values/aboutlibraries.xml index 2b7a754..eebca23 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.9 + 3.2.0 https://github.com/mikepenz/Android-ActionItemBadge apache_2_0 true