Merge pull request #4037 from HrBDev/develop

Don't mix android.arch & androidx dependencies
This commit is contained in:
H. Lehmann 2020-04-10 14:43:06 +02:00 committed by GitHub
commit a0c7e17996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -144,7 +144,7 @@ dependencies {
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
implementation "androidx.media:media:1.1.0"
implementation "android.arch.work:work-runtime:$workManagerVersion"
implementation "androidx.work:work-runtime:$workManagerVersion"
implementation "com.google.android.material:material:1.0.0"
annotationProcessor "androidx.annotation:annotation:1.1.0"
compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"

View File

@ -46,7 +46,7 @@ project.ext {
minSdkVersion = 16
targetSdkVersion = 28
workManagerVersion = "1.0.1"
workManagerVersion = "2.3.4"
espressoVersion = "3.2.0"
awaitilityVersion = "3.1.6"
commonsioVersion = "2.5"

View File

@ -59,7 +59,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.1.0"
implementation "androidx.preference:preference:1.1.0"
annotationProcessor "androidx.annotation:annotation:1.1.0"
implementation "android.arch.work:work-runtime:$workManagerVersion"
implementation "androidx.work:work-runtime:$workManagerVersion"
implementation "androidx.media:media:1.1.0"
implementation "org.apache.commons:commons-lang3:$commonslangVersion"
implementation "commons-io:commons-io:$commonsioVersion"