From ee2bc75ecf768ce86b0336616fad542e2af02ef7 Mon Sep 17 00:00:00 2001 From: Frieder Bluemle Date: Sat, 1 Feb 2020 11:14:22 -0800 Subject: [PATCH] Update espresso-core to 3.2.0 --- app/build.gradle | 10 ++-------- app/proguard-rules.pro | 5 ----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a47a33a3..1c849952 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -101,7 +101,6 @@ ext.daggerVersion = '2.25.3' // if libraries are changed here, they should also be changed in LicenseActivity dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "androidx.core:core-ktx:1.2.0-rc01" @@ -161,23 +160,18 @@ dependencies { } implementation "com.mikepenz:google-material-typeface:3.0.1.3.original@aar" - implementation("com.theartofdev.edmodo:android-image-cropper:2.8.0") { - exclude group: "com.android.support" - } + implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" implementation "com.evernote:android-job:1.4.2" implementation "de.c1710:filemojicompat:1.0.17" - testImplementation "androidx.test.ext:junit:1.1.1" testImplementation "org.robolectric:robolectric:4.3.1" testImplementation "org.mockito:mockito-inline:3.2.4" testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1", { - exclude group: "com.android.support", module: "support-annotations" - }) + androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0" androidTestImplementation "android.arch.persistence.room:testing:1.1.1" androidTestImplementation "androidx.test.ext:junit:1.1.1" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index df9e06fd..2d554c99 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -35,11 +35,6 @@ -keepclassmembers class **.R$* { public static ; } -# The support library contains references to newer platform versions. -# Don't warn about those in case this app is linking against an older -# platform version. We know about them, and they are safe. --dontwarn android.support.** - # TUSKY SPECIFIC OPTIONS