diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2019-10-04 11:38:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-04 11:38:37 +0200 |
commit | 72f7713fff9468c4dbe1b1fc57e733fba021eb80 (patch) | |
tree | 33e8ef35496cc2630a99f30a8513bbf2903a35f2 /core/build.gradle | |
parent | 7fde9f73c6729bdc4bf8e1b4fc385f69fd1bd8ae (diff) | |
parent | f0e8453bb53879943ac924367237c655efc4de2b (diff) | |
download | AntennaPod-72f7713fff9468c4dbe1b1fc57e733fba021eb80.zip |
Merge pull request #3468 from ByteHamster/androidx
Migration to AndroidX
Diffstat (limited to 'core/build.gradle')
-rw-r--r-- | core/build.gradle | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/build.gradle b/core/build.gradle index 8614d5589..8e449a379 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" testApplicationId "de.danoeh.antennapod.core.tests" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { annotationProcessorOptions { @@ -56,9 +56,9 @@ android { } dependencies { - implementation "com.android.support:support-v4:$supportVersion" - implementation "com.android.support:appcompat-v7:$supportVersion" - implementation "com.android.support:preference-v14:$supportVersion" + 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 "org.apache.commons:commons-lang3:$commonslangVersion" @@ -84,7 +84,7 @@ dependencies { // free build hack: skip some dependencies if (!doFreeBuild()) { playApi "com.google.android.libraries.cast.companionlibrary:ccl:$castCompanionLibVer" - api "com.android.support:mediarouter-v7:$supportVersion" + api "androidx.mediarouter:mediarouter:1.0.0" playApi "com.google.android.gms:play-services-cast:$playServicesVersion" api "com.google.android.support:wearable:$wearableSupportVersion" } else { @@ -94,9 +94,9 @@ dependencies { testImplementation "org.awaitility:awaitility:$awaitilityVersion" testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:1.10.19' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test:rules:1.0.2' + androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test:rules:1.2.0' } |