Merge branch 'dev' into 'master'

Release 3.0.0

See merge request zsmb/MaterialDrawerKt!70

Author: zsmb13

.travis.yml

@@ -13,9 +13,9 @@ cache:
 
 env:
  global:
- - ANDROID_API=28
+  - ANDROID_API=29
  - EMULATOR_API=21
- - ANDROID_BUILD_TOOLS=28.0.3
+  - ANDROID_BUILD_TOOLS=29.0.0
  - ADB_INSTALL_TIMEOUT=10 # minutes
 
 android:
@@ -37,7 +37,7 @@ before_install:
   - mkdir "$ANDROID_HOME/licenses" || true
   - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
   - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "platforms;android-29"
   - chmod +x gradlew
 
 notifications:

LICENSE

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

README.md

@@ -23,20 +23,22 @@ You can find the sample app [in the Play Store](https://play.google.com/store/ap
 
 # Setup
 
-The library is hosted on jcenter. To use it, add the following to your module level `build.gradle` file's dependencies:
+The library is hosted on `mavenCentral()`. To use it, add the following to your module level `build.gradle` file's dependencies:
 
 ```gradle
-implementation 'co.zsmb:materialdrawer-kt:2.0.1'
+implementation 'co.zsmb:materialdrawer-kt:3.0.0'
 
-//required support lib modules
-implementation "androidx.appcompat:appcompat:${versions.androidX}"
-implementation "androidx.recyclerview:recyclerview:${versions.androidX}"
-implementation "androidx.annotation:annotation:${versions.androidX}"
-implementation "com.google.android.material:material:${versions.androidX}"
+// required support lib modules
+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}"
 implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
 ```
 
-In general, you don't have to include the original library separately. (See the note in the FAQ.)
+In general, you don't have to include the original library separately. (See the note in the [FAQ](#faq).)
+
+***If you want to use the pre-Kotlin version of the base library for some reason, you can use the last 2.x release of the library found [here](https://github.com/zsmb13/MaterialDrawerKt/releases/tag/2.0.1).***
 
 ***If you're not using AndroidX yet, you can use the last 1.x release of the library found [here](https://github.com/zsmb13/MaterialDrawerKt/releases/tag/1.3.7).***
 
@@ -392,7 +394,7 @@ primaryItem("Hello") {
 
 # License
 
-    Copyright 2019 Marton Braun
+    Copyright 2020 Marton Braun
 
     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

@@ -5,12 +5,11 @@ apply plugin: 'kotlin-android-extensions'
 apply from: '../testformatter.gradle'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
     defaultConfig {
         applicationId "co.zsmb.materialdrawerktexample"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 4
         versionName "2.0.0"
     }
@@ -39,8 +38,9 @@ android {
 dependencies {
     implementation project(path: ':library')
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.slidingpanelayout:slidingpanelayout:1.0.0'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
 

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.61'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.0"

library/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 ext {
     PUBLISH_GROUP_ID = 'co.zsmb'
     PUBLISH_ARTIFACT_ID = 'materialdrawer-kt'
-    PUBLISH_VERSION = '3.0.0-rc01'
+    PUBLISH_VERSION = '3.0.0'
 }
 
 android {
@@ -28,9 +28,9 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    api 'com.mikepenz:materialdrawer:7.0.0-rc04'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.mikepenz:materialdrawer:7.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
 }