Merge branch 'release/v6.0.5'

mikepenz · Feb 4, 2018 · 8287eb0 · 8287eb0
2 parents d782a9b + 78fdff7
commit 8287eb0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -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.4@aar") {
+implementation("com.mikepenz:materialdrawer:6.0.5@aar") {
    transitive = true
 }
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 6040
-        versionName "6.0.4"
+        versionCode 6050
+        versionName "6.0.5"
 
         setProperty("archivesBaseName", "MaterialDrawer-v$versionName-c$versionCode")
     }
@@ -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.2@aar'
+    implementation 'com.mikepenz:fastadapter-commons:3.2.3@aar'
     // used to generate the Open Source section
     // https://github.com/mikepenz/AboutLibraries
-    implementation('com.mikepenz:aboutlibraries:6.0.0@aar') {
+    implementation('com.mikepenz:aboutlibraries:6.0.3@aar') {
         transitive = true
     }
     //used to provide different itemAnimators for the RecyclerView
@@ -76,13 +76,13 @@ dependencies {
     // icon fonts used inside the sample
     // https://github.com/mikepenz/Android-Iconics
     implementation 'com.mikepenz:google-material-typeface:3.0.1.1.original@aar'
-    implementation 'com.mikepenz:fontawesome-typeface:4.7.0.1@aar'
+    implementation 'com.mikepenz:fontawesome-typeface:5.0.6.0@aar'
     implementation 'com.mikepenz:octicons-typeface:3.0.0.1@aar'
 }
 
 configurations.all {
     resolutionStrategy.force "com.mikepenz:iconics-core:3.0.2"
-    resolutionStrategy.force "com.mikepenz:fastadapter:3.2.2"
+    resolutionStrategy.force "com.mikepenz:fastadapter:3.2.3"
     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}"

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=6.0.4
-VERSION_CODE=6040
+VERSION_NAME=6.0.5
+VERSION_CODE=6050
 GROUP=com.mikepenz
 POM_DESCRIPTION=MaterialDrawer Library
 POM_URL=https://github.com/mikepenz/MaterialDrawer

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 6040
-        versionName '6.0.4'
+        versionCode 6050
+        versionName '6.0.5'
     }
     buildTypes {
         release {
@@ -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.2@aar'
-    compile 'com.mikepenz:fastadapter-extensions-expandable:3.2.2@aar'
+    compile 'com.mikepenz:fastadapter:3.2.3@aar'
+    compile 'com.mikepenz:fastadapter-extensions-expandable:3.2.3@aar'
 }
diff --git a/library/src/main/java/com/mikepenz/materialdrawer/AccountHeaderBuilder.java b/library/src/main/java/com/mikepenz/materialdrawer/AccountHeaderBuilder.java
@@ -896,7 +896,8 @@ protected void calculateProfiles() {
 
         if (mCurrentProfile == null) {
             int setCount = 0;
-            for (int i = 0; i < mProfiles.size(); i++) {
+            int size = mProfiles.size();
+            for (int i = 0; i < size; i++) {
                 if (mProfiles.size() > i && mProfiles.get(i).isSelectable()) {
                     if (setCount == 0 && (mCurrentProfile == null)) {
                         mCurrentProfile = mProfiles.get(i);

diff --git a/library/src/main/res/values/donottranslate_library_materialdrawer_strings.xml b/library/src/main/res/values/donottranslate_library_materialdrawer_strings.xml
@@ -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.4</string>
+    <string name="library_materialdrawer_libraryVersion">6.0.5</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>