diff --git a/README.md b/README.md index 88466fb7..bab786f5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MaterialDrawer [![Download](https://api.bintray.com/packages/mikepenz/maven/com.mikepenz%3Amaterialdrawer/images/download.svg) ](https://bintray.com/mikepenz/maven/com.mikepenz%3Amaterialdrawer/_latestVersion) +# MaterialDrawer ... the flexible, easy to use, all in one drawer library for your Android project. @@ -49,7 +49,7 @@ ## Latest releases 🛠 -- Kotlin && New | [v8.3.2](https://github.com/mikepenz/MaterialDrawer/tree/v8.3.2) +- Kotlin && New | [v8.3.3](https://github.com/mikepenz/MaterialDrawer/tree/v8.3.3) - 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) diff --git a/app/build.gradle b/app/build.gradle index 235f6703..656887b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,6 +64,7 @@ dependencies { implementation project(':materialdrawer-nav') implementation "androidx.multidex:multidex:${versions.multiDex}" + implementation "com.google.android.material:material:${versions.material}" implementation "androidx.appcompat:appcompat:${versions.appcompat}" implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}" @@ -75,10 +76,6 @@ dependencies { // used to showcase how to load images implementation("io.coil-kt:coil:1.1.1") - // needed to fix glide androidX support - implementation "com.android.support:support-annotations:28.0.0" - annotationProcessor 'com.android.support:support-annotations:28.0.0' - // the sample uses more advanced functions of the fastadapter // https://github.com/mikepenz/FastAdapter/ implementation "com.mikepenz:fastadapter-extensions-utils:${versions.fastadapter}" @@ -104,9 +101,6 @@ dependencies { 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-jdk8:${versions.kotlin}" - // navigation implementation "androidx.navigation:navigation-fragment-ktx:${versions.navigation}" implementation "androidx.navigation:navigation-ui-ktx:${versions.navigation}" diff --git a/build.gradle b/build.gradle index 6e446388..878de30d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ buildscript { ext { release = [ - versionName: "8.3.2", - versionCode: 8032 + versionName: "8.3.3", + versionCode: 8033 ] setup = [ @@ -25,9 +25,9 @@ buildscript { constraintLayout : '2.0.4', cardview : '1.0.0', kotlin : "1.4.30", - fastadapter : "5.3.2", - iconics : "5.2.5", - aboutLibs : "8.8.1", + fastadapter : "5.3.4", + iconics : "5.2.6", + aboutLibs : "8.8.2", navigation : "2.3.3", detekt : '1.15.0', slidingpaneLayout : "1.1.0", diff --git a/gradle-release.gradle b/gradle-release.gradle index d3a2af62..9565c798 100644 --- a/gradle-release.gradle +++ b/gradle-release.gradle @@ -79,6 +79,9 @@ afterEvaluate { project -> asNode().appendNode('description', POM_DESCRIPTION) asNode().appendNode('url', POM_SCM_URL) asNode().children().last() + pomConfig + + // we want dependencies as compile, to ensure they are transitively resolved + asNode().dependencies.'*'.findAll() { it.scope.text() == 'runtime' }.each { it.scope*.value = 'compile' } } } } diff --git a/materialdrawer-iconics/build.gradle b/materialdrawer-iconics/build.gradle index 8c833329..3ed2fdcf 100644 --- a/materialdrawer-iconics/build.gradle +++ b/materialdrawer-iconics/build.gradle @@ -40,9 +40,6 @@ android { dependencies { implementation project(':materialdrawer') - // kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - // 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 diff --git a/materialdrawer-nav/build.gradle b/materialdrawer-nav/build.gradle index 2af1bf80..4bf43c03 100644 --- a/materialdrawer-nav/build.gradle +++ b/materialdrawer-nav/build.gradle @@ -40,11 +40,8 @@ android { dependencies { implementation project(':materialdrawer') - // kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - // navigation - implementation "androidx.navigation:navigation-runtime:${versions.navigation}" + implementation "androidx.navigation:navigation-runtime-ktx:${versions.navigation}" implementation "androidx.navigation:navigation-ui-ktx:${versions.navigation}" } diff --git a/materialdrawer/build.gradle b/materialdrawer/build.gradle index a1b7cf01..d5a9247a 100644 --- a/materialdrawer/build.gradle +++ b/materialdrawer/build.gradle @@ -44,10 +44,12 @@ android { dependencies { implementation "androidx.core:core-ktx:${versions.core}" - implementation "androidx.drawerlayout:drawerlayout:${versions.drawerlayout}" + + api "androidx.drawerlayout:drawerlayout:${versions.drawerlayout}" + api "androidx.recyclerview:recyclerview:${versions.recyclerView}" + implementation "androidx.appcompat:appcompat:${versions.appcompat}" - implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}" - implementation "androidx.annotation:annotation:${versions.annotation}" + implementation "com.google.android.material:material:${versions.material}" // add the constraintLayout used to create the items and headers @@ -60,7 +62,7 @@ dependencies { api "com.mikepenz:fastadapter-extensions-expandable:${versions.fastadapter}" // kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" + api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" } if (project.hasProperty('pushall') || project.hasProperty('library_only')) {