Skip to content

Commit

Permalink
Merge branch 'release/v6.0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Feb 7, 2018
2 parents 8287eb0 + 6c7c52d commit a6abc67
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 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
implementation("com.mikepenz:materialdrawer:6.0.5@aar") {
implementation("com.mikepenz:materialdrawer:6.0.6@aar") {
transitive = true
}
Expand Down
10 changes: 5 additions & 5 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 6050
versionName "6.0.5"
versionCode 6060
versionName "6.0.6"

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

// the sample uses more advanced functions of the fastadapter
// https://github.com/mikepenz/FastAdapter/
implementation 'com.mikepenz:fastadapter-commons:3.2.3@aar'
implementation 'com.mikepenz:fastadapter-commons:3.2.4@aar'
// used to generate the Open Source section
// https://github.com/mikepenz/AboutLibraries
implementation('com.mikepenz:aboutlibraries:6.0.3@aar') {
implementation('com.mikepenz:aboutlibraries:6.0.4@aar') {
transitive = true
}
//used to provide different itemAnimators for the RecyclerView
Expand All @@ -82,7 +82,7 @@ dependencies {

configurations.all {
resolutionStrategy.force "com.mikepenz:iconics-core:3.0.2"
resolutionStrategy.force "com.mikepenz:fastadapter:3.2.3"
resolutionStrategy.force "com.mikepenz:fastadapter:3.2.4"
resolutionStrategy.force "com.android.support:support-v4:${versions.supportLib}"
resolutionStrategy.force "com.android.support:appcompat-v7:${versions.supportLib}"
resolutionStrategy.force "com.android.support:cardview-v7:${versions.supportLib}"
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=6.0.5
VERSION_CODE=6050
VERSION_NAME=6.0.6
VERSION_CODE=6060
GROUP=com.mikepenz
POM_DESCRIPTION=MaterialDrawer Library
POM_URL=https://github.com/mikepenz/MaterialDrawer
Expand Down
8 changes: 4 additions & 4 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 6050
versionName '6.0.5'
versionCode 6060
versionName '6.0.6'
}
buildTypes {
release {
Expand Down Expand Up @@ -47,6 +47,6 @@ 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:3.2.3@aar'
compile 'com.mikepenz:fastadapter-extensions-expandable:3.2.3@aar'
compile 'com.mikepenz:fastadapter:3.2.4@aar'
compile 'com.mikepenz:fastadapter-extensions-expandable:3.2.4@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">6.0.5</string>
<string name="library_materialdrawer_libraryVersion">6.0.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 a6abc67

Please sign in to comment.