Merge pull request #2706 from mikepenz/develop

dev -> main

.github/workflows/ci.yml

@@ -74,17 +74,23 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: ./gradlew app:assembleRelease app:bundleRelease
 
-      - name: Relase bintray
+      - name: Prepare Sonatype Gradle properties
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          echo "${{ secrets.SONATYPE_GPG_FILE }}" > opensource.gpg.asc
+          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "opensource.gpg.asc" > "$HOME/.gradle/opensource.gpg"
+          echo "sonatype.gpg.key=${{ secrets.SONATYPE_GPG_KEY }}" >> ~/.gradle/gradle.properties
+          echo "sonatype.gpg.password=${{ secrets.SONATYPE_GPG_PASS }}" >> ~/.gradle/gradle.properties
+          echo "sonatype.gpg.secretKeyRingFile=$HOME/.gradle/opensource.gpg" >> ~/.gradle/gradle.properties
+
+      - name: Relase Sonatype
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           ./gradlew build -x test -x lint
-          ./gradlew library:bintrayUpload -x test -x lint -Plibrary_only --no-configure-on-demand --no-parallel
-          ./gradlew library-nav:bintrayUpload -x test -x lint -Plibrary_nav_only  --no-configure-on-demand --no-parallel
-          ./gradlew library-iconics:bintrayUpload -x test -x lint -Plibrary_iconics_only --no-configure-on-demand --no-parallel
+          ./gradlew materialdrawer:publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrary_only --no-configure-on-demand --no-parallel
+          ./gradlew materialdrawer-nav:publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrary_nav_only  --no-configure-on-demand --no-parallel
+          ./gradlew materialdrawer-iconics:publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrary_iconics_only --no-configure-on-demand --no-parallel
         env:
-          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-          BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
-          BINTRAY_GPG_PASS: ${{ secrets.BINTRAY_GPG_PASS }}
           NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016 Mike Penz
+   Copyright 2021 Mike Penz
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -49,7 +49,7 @@
 
 ## Latest releases 🛠
 
-- Kotlin && New | [v8.3.1](https://github.com/mikepenz/MaterialDrawer/tree/v8.3.1)
+- Kotlin && New | [v8.3.2](https://github.com/mikepenz/MaterialDrawer/tree/v8.3.2)
 - Kotlin | [v7.0.0](https://github.com/mikepenz/MaterialDrawer/tree/v7.0.0) | (Builder approach like v6.x)
 - Java && AndroidX | [v6.1.2](https://github.com/mikepenz/MaterialDrawer/tree/v6.1.2)
 - Java && AppCompat | [v6.0.9](https://github.com/mikepenz/MaterialDrawer/tree/v6.0.9)
@@ -362,7 +362,7 @@ Overwrite the Style of the BezelImageView for the whole MaterialDrawer
 
 # License
 
-    Copyright 2020 Mike Penz
+    Copyright 2021 Mike Penz
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app/build.gradle

@@ -59,9 +59,9 @@ android {
 }
 
 dependencies {
-    implementation project(':library')
-    implementation project(':library-iconics')
-    implementation project(':library-nav')
+    implementation project(':materialdrawer')
+    implementation project(':materialdrawer-iconics')
+    implementation project(':materialdrawer-nav')
 
     implementation "androidx.multidex:multidex:${versions.multiDex}"
     implementation "com.google.android.material:material:${versions.material}"
@@ -73,7 +73,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshLayout}"
 
     // used to showcase how to load images
-    implementation("io.coil-kt:coil:1.1.0")
+    implementation("io.coil-kt:coil:1.1.1")
 
     // needed to fix glide androidX support
     implementation "com.android.support:support-annotations:28.0.0"
@@ -100,12 +100,12 @@ dependencies {
 
     // icon fonts used inside the sample
     // https://github.com/mikepenz/Android-Iconics
-    implementation 'com.mikepenz:google-material-typeface:3.0.1.6.original-kotlin@aar'
+    implementation 'com.mikepenz:google-material-typeface:4.0.0.1-kotlin@aar'
     implementation 'com.mikepenz:fontawesome-typeface:5.9.0.2-kotlin@aar'
     implementation 'com.mikepenz:octicons-typeface:11.1.0.0-kotlin@aar'
 
     // kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
 
     // navigation
     implementation "androidx.navigation:navigation-fragment-ktx:${versions.navigation}"

build.gradle

@@ -3,8 +3,8 @@ buildscript {
 
     ext {
         release = [
-                versionName: "8.3.1",
-                versionCode: 8031
+                versionName: "8.3.2",
+                versionCode: 8032
         ]
 
         setup = [
@@ -19,17 +19,17 @@ buildscript {
                 annotation        : '1.1.0',
                 recyclerView      : '1.1.0',
                 core              : '1.3.2',
-                material          : '1.2.1',
+                material          : '1.3.0',
                 appcompat         : '1.2.0',
                 drawerlayout      : '1.1.1',
                 constraintLayout  : '2.0.4',
                 cardview          : '1.0.0',
-                kotlin            : "1.4.21",
+                kotlin            : "1.4.30",
                 fastadapter       : "5.3.2",
-                iconics           : "5.2.1",
-                aboutLibs         : "8.6.3",
-                navigation        : "2.3.2",
-                detekt            : '1.14.2',
+                iconics           : "5.2.5",
+                aboutLibs         : "8.8.1",
+                navigation        : "2.3.3",
+                detekt            : '1.15.0',
                 slidingpaneLayout : "1.1.0",
                 swiperefreshLayout: "1.1.0"
         ]
@@ -38,13 +38,11 @@ buildscript {
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
         google()
-        jcenter()
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}"
@@ -53,16 +51,18 @@ buildscript {
 }
 
 allprojects {
+    group "com.mikepenz"
+
     repositories {
         google()
-        jcenter()
         mavenCentral()
+        jcenter()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 }
 
 subprojects {
-    apply from: '../detekt.gradle'
+    apply from: "$rootDir/detekt.gradle"
 
     dependencies {
         detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:${versions.detekt}"

gradle-release.gradle

@@ -1,7 +1,9 @@
-@SuppressWarnings(["GroovyUnusedDeclaration", "GrMethodMayBeStatic"])
-def isReleaseBuild() {
-    return !VERSION_NAME.contains("SNAPSHOT")
-}
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+ext["signing.keyId"] = project.hasProperty('sonatype.gpg.key') ? project.property('sonatype.gpg.key') : System.getenv('SONATYPE_GPG_KEY')
+ext["signing.password"] = project.hasProperty('sonatype.gpg.password') ? project.property('sonatype.gpg.password') : System.getenv('SONATYPE_GPG_PASS')
+ext["signing.secretKeyRingFile"] = project.hasProperty('sonatype.gpg.secretKeyRingFile') ? project.property('sonatype.gpg.secretKeyRingFile') : System.getenv('SONATYPE_GPG_FILE')
 
 @SuppressWarnings("GroovyUnusedDeclaration")
 def getRepositoryUsername() {
@@ -13,12 +15,7 @@ def getRepositoryPassword() {
     return project.hasProperty('NEXUS_PASSWORD') ? project.property('NEXUS_PASSWORD') : System.getenv('NEXUS_PASSWORD')
 }
 
-apply plugin: "com.jfrog.bintray"
-
 afterEvaluate { project ->
-    apply plugin: 'maven-publish'
-    apply plugin: 'com.github.dcendents.android-maven'
-
     if (JavaVersion.current().isJava8Compatible()) {
         allprojects {
             tasks.withType(Javadoc) {
@@ -43,60 +40,6 @@ afterEvaluate { project ->
         from android.sourceSets.main.java.source
     }
 
-    bintray {
-        dryRun = false
-        publish = true
-        override = true
-        user = project.hasProperty('bintray.user') ? project.property('bintray.user') : System.getenv('BINTRAY_USER')
-        key = project.hasProperty('bintray.apikey') ? project.property('bintray.apikey') : System.getenv('BINTRAY_API_KEY')
-        def gpgkey = project.hasProperty('bintray.gpg.key') ? project.property('bintray.gpg.key') : System.getenv('BINTRAY_GPG_KEY')
-        def gpgpass = project.hasProperty('bintray.gpg.password') ? project.property('bintray.gpg.password') : System.getenv('BINTRAY_GPG_PASS')
-        def versionName = project.release.versionName
-
-        publications('release')
-
-        pkg {
-            publish = true
-
-            repo = "maven"
-            name = GROUP + ":" + POM_ARTIFACT_ID //the name (= identifier) on bintray
-            desc = POM_DESCRIPTION
-
-            websiteUrl = POM_URL
-            issueTrackerUrl = POM_SCM_URL_ISSUES
-            vcsUrl = POM_SCM_URL
-
-            githubRepo = POM_GITHUB_REPO
-            githubReleaseNotesFile = POM_GITHUB_README
-
-            publicDownloadNumbers = true
-            licenses = ["Apache-2.0"]
-            version {
-                name = versionName
-                vcsTag = versionName
-                released = new Date()
-
-                mavenCentralSync {
-                    sync = true
-                    user = getRepositoryUsername()
-                    password = getRepositoryPassword()
-                    close = '1'
-                }
-                gpg {
-                    sign = true
-                    passphrase = gpgpass
-                }
-            }
-        }
-    }
-
-    ext.addDependency = { dependencyNode, group, name, version ->
-        dependencyNode.appendNode('groupId', group)
-        dependencyNode.appendNode('artifactId', name)
-        dependencyNode.appendNode('version', version)
-        dependencyNode.appendNode('scope', "compile")
-    }
-
     def pomConfig = {
         licenses {
             license {
@@ -122,32 +65,40 @@ afterEvaluate { project ->
     publishing {
         publications {
             release(MavenPublication) {
+                from components.release
+
                 groupId GROUP
                 artifactId POM_ARTIFACT_ID
-                version project.release.versionName
-                artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
+                version android.defaultConfig.versionName
+
                 artifact androidSourcesJar
                 artifact androidJavadocsJar
 
                 pom.withXml {
-                    asNode().appendNode('name', POM_NAME);
-                    asNode().appendNode('description', POM_DESCRIPTION);
-                    asNode().appendNode('url', POM_SCM_URL);
-                    def dependenciesNode = asNode().appendNode('dependencies');
-                    configurations.implementation.allDependencies.each {
-                        // Ensure dependencies such as fileTree are not included.
-                        if (it.name != 'unspecified') {
-                            def dependencyNode = dependenciesNode.appendNode('dependency')
-                            if (it.version != "unspecified") {
-                                addDependency(dependencyNode, it.group, it.name, it.version)
-                            } else {
-                                addDependency(dependencyNode, it.getDependencyProject().findProperty("GROUP"), it.getDependencyProject().findProperty("POM_ARTIFACT_ID"), project.release.versionName)
-                            }
-                        }
-                    }
+                    asNode().appendNode('name', POM_NAME)
+                    asNode().appendNode('description', POM_DESCRIPTION)
+                    asNode().appendNode('url', POM_SCM_URL)
                     asNode().children().last() + pomConfig
                 }
             }
         }
+
+        repositories {
+            maven {
+                name = "sonatype"
+                def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+                def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+
+                credentials {
+                    username getRepositoryUsername()
+                    password getRepositoryPassword()
+                }
+            }
+        }
     }
+}
+
+signing {
+    sign publishing.publications
 }

gradle.properties

@@ -11,7 +11,7 @@ POM_SCM_URL_ISSUES=https://github.com/mikepenz/MaterialDrawer/issues
 POM_GITHUB_REPO=mikepenz/MaterialDrawer
 POM_GITHUB_README=README.md
 
-POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_NAME=Apache-2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library-iconics/build.gradle → materialdrawer-iconics/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+version release.versionName
+
 android {
     compileSdkVersion setup.compileSdk
     buildToolsVersion setup.buildTools
@@ -36,7 +38,7 @@ android {
 }
 
 dependencies {
-    implementation project(':library')
+    implementation project(':materialdrawer')
 
     // kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"

library-nav/build.gradle → materialdrawer-nav/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+version release.versionName
+
 android {
     compileSdkVersion setup.compileSdk
     buildToolsVersion setup.buildTools
@@ -36,7 +38,7 @@ android {
 }
 
 dependencies {
-    implementation project(':library')
+    implementation project(':materialdrawer')
 
     // kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"

library/build.gradle → materialdrawer/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+version release.versionName
+
 android {
     compileSdkVersion setup.compileSdk
     buildToolsVersion setup.buildTools

library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.kt → materialdrawer/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.kt

@@ -12,9 +12,9 @@ import com.mikepenz.materialdrawer.holder.BadgeStyle
 import com.mikepenz.materialdrawer.holder.ImageHolder
 import com.mikepenz.materialdrawer.holder.StringHolder
 import com.mikepenz.materialdrawer.model.interfaces.*
-import com.mikepenz.materialdrawer.util.setDrawerVerticalPadding
 import com.mikepenz.materialdrawer.util.getPrimaryDrawerIconColor
 import com.mikepenz.materialdrawer.util.getSelectableBackground
+import com.mikepenz.materialdrawer.util.setDrawerVerticalPadding
 
 /**
  * Describes a [IProfile] being used with the [com.mikepenz.materialdrawer.widget.AccountHeaderView]

library/src/main/java/com/mikepenz/materialdrawer/util/MenuDrawerUtils.kt → materialdrawer/src/main/java/com/mikepenz/materialdrawer/util/MenuDrawerUtils.kt

@@ -9,7 +9,9 @@ import com.mikepenz.materialdrawer.R
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.*
+import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem
+import com.mikepenz.materialdrawer.model.interfaces.iconDrawable
+import com.mikepenz.materialdrawer.model.interfaces.nameText
 import com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
 
 /**