From c4380d8791ccf7a2309917a1b034209aa3629cab Mon Sep 17 00:00:00 2001
From: Felix <mail@nicidienase.de>
Date: Sun, 9 Sep 2018 15:56:56 +0200
Subject: [PATCH] update dependencies

---
 leanback/build.gradle | 23 +++++++++++------------
 settings.gradle       |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/leanback/build.gradle b/leanback/build.gradle
index 842821a0..85b4fcea 100644
--- a/leanback/build.gradle
+++ b/leanback/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+    buildToolsVersion '27.0.3'
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
@@ -45,36 +46,34 @@ android {
     lintOptions {
         abortOnError false
     }
-    buildToolsVersion '26.0.2'
 }
 
 
 dependencies {
     implementation "de.nicidienase.chaosflix:common:1.0.1-SNAPSHOT"
-    compile fileTree(include: ['*.jar'], dir: 'libs')
     implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibraryVersion}"
     implementation "com.android.support:cardview-v7:${rootProject.ext.supportLibraryVersion}"
     implementation "com.android.support:leanback-v17:${rootProject.ext.supportLibraryVersion}"
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibraryVersion}"
     implementation "com.android.support:design:${rootProject.ext.supportLibraryVersion}"
-    implementation 'com.android.support:multidex:1.0.2'
+    implementation 'com.android.support:multidex:1.0.3'
 
     implementation 'com.google.android.exoplayer:exoplayer:r2.5.2'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.3'
-
-    implementation 'com.github.satyan:sugar:1.5'
+//    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+//    implementation 'io.reactivex.rxjava2:rxjava:2.1.4'
+//
+//    implementation 'com.github.satyan:sugar:1.5'
     implementation 'com.github.bumptech.glide:glide:3.8.0'
 
     implementation 'com.squareup.retrofit2:retrofit:2.3.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+//    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
 
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'org.joda:joda-convert:1.8'
 
-    implementation 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+//    implementation 'com.jakewharton:butterknife:8.5.1'
+//    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
     debugImplementation 'com.facebook.stetho:stetho:1.4.2'
     debugImplementation 'com.facebook.stetho:stetho-okhttp:1.4.2'
     debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.4.2'
@@ -88,9 +87,9 @@ dependencies {
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.6.0'
     androidTestImplementation group: 'commons-io', name: 'commons-io', version: '2.4'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:2.11.0'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/settings.gradle b/settings.gradle
index eeb03aba..8e6592b1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':touch', ':common'
+include ':touch', ':common', ':leanback'