Skip to content

Commit

Permalink
Merge branch 'release/v3.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Jan 26, 2016
2 parents 1ca8d69 + 25d43b7 commit f64d6ac
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad

```javascript
dependencies {
compile 'com.mikepenz:actionitembadge:3.2.1@aar'
compile 'com.mikepenz:actionitembadge:3.2.2@aar'

//SUB-DEPENDENCIES
//Android-Iconics - used to provide an easy API for icons
compile 'com.mikepenz:iconics-core:2.5.4@aar'
compile 'com.mikepenz:iconics-core:2.5.5@aar'
}
```

Expand Down
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
versionCode 321
versionName "3.2.1"
versionCode 322
versionName "3.2.2"
}
buildTypes {
release {
Expand All @@ -30,20 +30,20 @@ dependencies {
// 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'
compile 'com.mikepenz:materialize:0.6.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'
compile 'com.mikepenz:iconics-core:2.5.5@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'
compile 'com.mikepenz:aboutlibraries:5.3.7@aar'

//used to display the icons in the drawer and in the menu
//https://github.com/mikepenz/Android-Iconics
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
VERSION_CODE=321
VERSION_NAME=3.2.2
VERSION_CODE=322
GROUP=com.mikepenz

POM_DESCRIPTION=Android-ActionItemBadge Library
Expand Down
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
versionCode 321
versionName "3.2.1"
versionCode 322
versionName "3.2.2"
}
buildTypes {
release {
Expand All @@ -25,5 +25,5 @@ dependencies {
// 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'
compile 'com.mikepenz:iconics-core:2.5.5@aar'
}
2 changes: 1 addition & 1 deletion library/gradle-jcenter-push.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish {
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")
artifactId = project.property("POM_ARTIFACT_ID")
publishVersion = project.property("VERSION_NAME")
desc = project.property("POM_DESCRIPTION")
website = project.property("POM_URL")
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/res/values/aboutlibraries.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1</string>
<string name="library_AndroidActionItemBadge_libraryVersion">3.2.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>
Expand Down

0 comments on commit f64d6ac

Please sign in to comment.