Skip to content

Commit

Permalink
Merge branch 'release/v5.2.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed May 13, 2016
2 parents bc331cf + a49b123 commit 91d9cec
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ You can find some frequently asked questions and other resources in the [WIKI /
##1. Provide the gradle dependency

```gradle
compile('com.mikepenz:materialdrawer:5.2.5@aar') {
compile('com.mikepenz:materialdrawer:5.2.6@aar') {
transitive = true
}
```
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
defaultConfig {
minSdkVersion setup.minSdk
targetSdkVersion setup.targetSdk
versionCode 525
versionName "5.2.5"
versionCode 526
versionName "5.2.6"

setProperty("archivesBaseName", "-v$versionName-c$versionCode")
}
Expand Down Expand Up @@ -53,7 +53,7 @@ dependencies {

// used to generate the Open Source section
// https://github.com/mikepenz/AboutLibraries
compile('com.mikepenz:aboutlibraries:5.6.3@aar') {
compile('com.mikepenz:aboutlibraries:5.6.6@aar') {
transitive = true
exclude module: "fastadapter"
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
minSdk : 10,
targetSdk : 23]

versions = [supportLib: "23.3.0"]
versions = [supportLib: "23.4.0"]
}

repositories {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maven stuff
VERSION_NAME=5.2.5
VERSION_CODE=525
VERSION_NAME=5.2.6
VERSION_CODE=526
GROUP=com.mikepenz

POM_DESCRIPTION=MaterialDrawer 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 setup.minSdk
targetSdkVersion setup.targetSdk
versionCode 525
versionName '5.2.5'
versionCode 526
versionName '5.2.6'
}
buildTypes {
release {
Expand Down Expand Up @@ -47,5 +47,5 @@ dependencies {
// used to fill the RecyclerView with the DrawerItems
// and provides single and multi selection, expandable items
// https://github.com/mikepenz/FastAdapter
compile 'com.mikepenz:fastadapter:1.5.0@aar'
compile 'com.mikepenz:fastadapter:1.5.1@aar'
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<b>MaterialDrawer</b> the flexible, easy to use, all in one drawer library for your Android project.
]]>
</string>
<string name="library_materialdrawer_libraryVersion">5.2.5</string>
<string name="library_materialdrawer_libraryVersion">5.2.6</string>
<string name="library_materialdrawer_libraryWebsite">https://github.com/mikepenz/MaterialDrawer</string>
<string name="library_materialdrawer_licenseId">apache_2_0</string>
<string name="library_materialdrawer_isOpenSource">true</string>
Expand Down

0 comments on commit 91d9cec

Please sign in to comment.