Merge branch 'release/v6.0.9'

mikepenz · Jul 22, 2018 · 6d71e67 · 6d71e67
2 parents cb3e30e + afe1bd3
commit 6d71e67
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 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.8@aar") {
+implementation("com.mikepenz:materialdrawer:6.0.9@aar") {
    transitive = true
 }
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -55,12 +55,11 @@ dependencies {
 
     // the sample uses more advanced functions of the fastadapter
     // https://github.com/mikepenz/FastAdapter/
-    implementation 'com.mikepenz:fastadapter-commons:3.2.6@aar'
+    implementation 'com.mikepenz:fastadapter-commons:3.2.8'
     // used to generate the Open Source section
     // https://github.com/mikepenz/AboutLibraries
-    implementation('com.mikepenz:aboutlibraries:6.0.9@aar') {
-        transitive = true
-    }
+    implementation 'com.mikepenz:aboutlibraries:6.0.9'
+
     //used to provide different itemAnimators for the RecyclerView
     //https://github.com/mikepenz/ItemAnimators
     implementation 'com.mikepenz:itemanimators:1.0.2@aar'
@@ -82,7 +81,7 @@ dependencies {
 
 configurations.all {
     resolutionStrategy.force "com.mikepenz:iconics-core:3.0.4"
-    resolutionStrategy.force "com.mikepenz:fastadapter:3.2.6"
+    resolutionStrategy.force "com.mikepenz:fastadapter:3.2.8"
     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/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/AccountDividerDrawerItem.java b/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/AccountDividerDrawerItem.java
@@ -57,7 +57,7 @@ public void bindView(ViewHolder viewHolder, List payloads) {
 
 
     @Override
-    public AccountDividerDrawerItem withName(String name) {
+    public AccountDividerDrawerItem withName(CharSequence name) {
         return null;
     }
 

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext {
         release = [
-                versionName: "6.0.8",
-                versionCode: 6080
+                versionName: "6.0.9",
+                versionCode: 6090
         ]
 
         setup = [
@@ -23,7 +23,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }

diff --git a/gradle-release.gradle b/gradle-release.gradle
@@ -58,7 +58,7 @@ afterEvaluate { project ->
             publish = true
 
             repo = "maven"
-            name = POM_ARTIFACT_ID
+            name = GROUP + ":" + POM_ARTIFACT_ID //the name (= identifier) on bintray
             desc = POM_DESCRIPTION
 
             websiteUrl = POM_URL
@@ -76,14 +76,14 @@ afterEvaluate { project ->
                 released = new Date()
 
                 mavenCentralSync {
-                    sync = false
-                    user = getRepositoryUsername() //OSS user token
-                    password = getRepositoryPassword() //OSS user password
+                    sync = true
+                    user = getRepositoryUsername()
+                    password = getRepositoryPassword()
                     close = '1'
                 }
                 gpg {
-                    sign = true //Determines whether to GPG sign the files. The default is false
-                    passphrase = gpgpass //Optional. The passphrase for GPG signing'
+                    sign = true
+                    passphrase = gpgpass
                 }
             }
         }
@@ -93,7 +93,6 @@ afterEvaluate { project ->
         dependencyNode.appendNode('groupId', group)
         dependencyNode.appendNode('artifactId', name)
         dependencyNode.appendNode('version', version)
-        //dependencyNode.appendNode('type', "aar")
         dependencyNode.appendNode('scope', "compile")
     }
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -45,8 +45,8 @@ dependencies {
     // used to fill the RecyclerView with the DrawerItems
     // and provides single and multi selection, expandable items
     // https://github.com/mikepenz/FastAdapter
-    api 'com.mikepenz:fastadapter:3.2.6@aar'
-    api 'com.mikepenz:fastadapter-extensions-expandable:3.2.6@aar'
+    api 'com.mikepenz:fastadapter:3.2.8'
+    api 'com.mikepenz:fastadapter-extensions-expandable:3.2.8'
 }
 
 apply from: '../gradle-release.gradle'
diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/MiniProfileDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/MiniProfileDrawerItem.java
@@ -38,7 +38,7 @@ public MiniProfileDrawerItem(ProfileDrawerItem profile) {
     }
 
     @Override
-    public MiniProfileDrawerItem withName(String name) {
+    public MiniProfileDrawerItem withName(CharSequence name) {
         return null;
     }
 

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileDrawerItem.java
@@ -81,7 +81,7 @@ public ProfileDrawerItem withIcon(Uri uri) {
         return this;
     }
 
-    public ProfileDrawerItem withName(String name) {
+    public ProfileDrawerItem withName(CharSequence name) {
         this.name = new StringHolder(name);
         return this;
     }

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java
@@ -80,7 +80,7 @@ public ProfileSettingDrawerItem withIcon(Uri uri) {
         return this;
     }
 
-    public ProfileSettingDrawerItem withName(String name) {
+    public ProfileSettingDrawerItem withName(CharSequence name) {
         this.name = new StringHolder(name);
         return this;
     }

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/interfaces/IProfile.java b/library/src/main/java/com/mikepenz/materialdrawer/model/interfaces/IProfile.java
@@ -14,7 +14,7 @@
  * Created by mikepenz on 03.02.15.
  */
 public interface IProfile<T> extends IIdentifyable<T> {
-    T withName(String name);
+    T withName(CharSequence name);
 
     StringHolder getName();
 

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/util/KeyboardUtil.java b/library/src/main/java/com/mikepenz/materialdrawer/util/KeyboardUtil.java
@@ -28,7 +28,9 @@
  * This class implements a hack to change the layout padding on bottom if the keyboard is shown
  * to allow long lists with editTextViews
  * Basic idea for this solution found here: http://stackoverflow.com/a/9108219/325479
+ * @deprecated Do not use this anymore, the MaterialDrawer uses the `fitsSystemWindows` now correctly so it should not be required. (it would only be required for cases with the fullscreen flag)
  */
+@Deprecated
 public class KeyboardUtil {
     private View decorView;
     private View contentView;