From 2ee95b4ca3024671c039acf2e1ed2342b75921f9 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Sat, 18 May 2019 08:06:30 +0200 Subject: [PATCH] upgrade deps (#1263) --- app/build.gradle | 14 ++++++++++---- app/src/main/res/values-night/styles.xml | 2 -- app/src/main/res/values/styles.xml | 2 -- build.gradle | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5d057823..44c59982 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,6 +80,12 @@ android { } } +project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + jvmTarget = "1.8" + } +} + ext.daggerVersion = '2.22.1' // if libraries are changed here, they should also be changed in LicenseActivity @@ -87,12 +93,12 @@ dependencies { implementation('com.mikepenz:materialdrawer:6.1.2@aar') { transitive = true } - implementation 'androidx.core:core:1.0.1' + implementation 'androidx.core:core:1.0.2' implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.browser:browser:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha05' + implementation 'com.google.android.material:material:1.1.0-alpha06' implementation 'androidx.exifinterface:exifinterface:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.preference:preference:1.1.0-alpha05' @@ -140,8 +146,8 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0' implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0' - implementation 'com.uber.autodispose:autodispose-android-archcomponents:1.2.0' - implementation 'com.uber.autodispose:autodispose-ktx:1.2.0' + implementation 'com.uber.autodispose:autodispose-android-archcomponents:1.3.0' + implementation 'com.uber.autodispose:autodispose:1.3.0' implementation 'androidx.paging:paging-runtime-ktx:2.1.0' //Glide diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index ea7d7be1..61432868 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -9,8 +9,6 @@ @color/tusky_blue @color/white - @color/color_primary_dark_dark - @color/color_primary_dark_dark @color/color_primary_dark_dark diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index bd57ff49..83482379 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -60,8 +60,6 @@ @color/tusky_blue @color/white - @color/color_background_light - @color/color_primary_dark_light @color/color_background_light diff --git a/build.gradle b/build.gradle index 9e96eceb..4cacf52c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04' - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }