Skip to content

Commit

Permalink
Merge branch 'release/v5.1.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Apr 7, 2016
2 parents 9962202 + 56917b3 commit 56cf945
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 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.1.8@aar') {
compile('com.mikepenz:materialdrawer:5.1.9@aar') {
transitive = true
}
```
Expand Down
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
defaultConfig {
minSdkVersion 10
targetSdkVersion 23
versionCode 518
versionName "5.1.8"
versionCode 519
versionName "5.1.9"

applicationVariants.all { variant ->
variant.outputs.each { output ->
Expand Down Expand Up @@ -59,21 +59,21 @@ dependencies {

// used to generate the Open Source section
// https://github.com/mikepenz/AboutLibraries
compile('com.mikepenz:aboutlibraries:5.6.2@aar') {
compile('com.mikepenz:aboutlibraries:5.6.3@aar') {
transitive = true
exclude module: "fastadapter"
}
//used to provide different itemAnimators for the RecyclerView
//https://github.com/mikepenz/ItemAnimators
compile 'com.mikepenz:itemanimators:0.2.3@aar'
compile 'com.mikepenz:itemanimators:0.2.4@aar'
// used to provide the MiniDrawer to normal Drawer crossfade effect via a SlidingPane layout
// --> https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/MiniDrawerActivity.java
// https://github.com/mikepenz/Crossfader
compile 'com.mikepenz:crossfader:1.3.6@aar'
compile 'com.mikepenz:crossfader:1.3.7@aar'
// used to provide the two step crossfade DrawerLayout. Which allows to have a mini layout which transforms to a normal layout within the drawer
// --> https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/CrossfadeDrawerLayoutActvitiy.java
// https://github.com/mikepenz/CrossfadeDrawerLayout
compile('com.mikepenz:crossfadedrawerlayout:0.3.3@aar')
compile('com.mikepenz:crossfadedrawerlayout:0.3.4@aar')

// icon fonts used inside the sample
// https://github.com/mikepenz/Android-Iconics
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.novoda:bintray-release:0.3.4'
}
}
Expand All @@ -19,8 +19,8 @@ allprojects {

ext {
compileSdkVersion = 23
buildToolsVersion = "23.0.2"
supportLibVersion = "23.2.1"
buildToolsVersion = "23.0.3"
supportLibVersion = "23.3.0"
}

task wrapper(type: Wrapper) {
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.1.8
VERSION_CODE=518
VERSION_NAME=5.1.9
VERSION_CODE=519
GROUP=com.mikepenz

POM_DESCRIPTION=MaterialDrawer Library
Expand Down
10 changes: 5 additions & 5 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
defaultConfig {
minSdkVersion 10
targetSdkVersion 23
versionCode 518
versionName '5.1.8'
versionCode 519
versionName '5.1.9'
}
buildTypes {
release {
Expand Down Expand Up @@ -37,15 +37,15 @@ 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.8.7@aar'
compile 'com.mikepenz:materialize:0.8.8@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.10@aar'
compile 'com.mikepenz:iconics-core:2.5.11@aar'

// 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.4.0@aar'
compile 'com.mikepenz:fastadapter:1.4.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.1.8</string>
<string name="library_materialdrawer_libraryVersion">5.1.9</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 56cf945

Please sign in to comment.