From ad25528b1863447588a36e4471a0cb61363733ae Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 17 Mar 2020 00:37:45 +0100 Subject: switch to AndroidX --- app/build.gradle | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index f8ee9d3a..5824addd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,7 +42,7 @@ android { buildConfigField "String", "customProviderIp", '""' buildConfigField "String", "customProviderApiIp", '""' - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" dexOptions { jumboMode true multiDexEnabled true @@ -297,9 +297,9 @@ dependencies { testImplementation group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.10.0' androidTestImplementation 'org.mockito:mockito-core:2.8.9' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0' //TODO: remove that library androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3' testImplementation 'junit:junit:4.12' @@ -316,15 +316,15 @@ dependencies { implementation 'com.intellij:annotations:12.0' implementation 'com.google.code.gson:gson:2.8.2' implementation 'com.squareup.okhttp3:okhttp:3.9.0' - implementation "com.android.support:support-core-utils:28.0.0" - implementation 'com.android.support:support-annotations:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:support-fragment:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:multidex:1.0.3' - implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'androidx.legacy:legacy-support-core-utils:1.0.0' + implementation 'androidx.annotation:annotation:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.fragment:fragment:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.multidex:multidex:2.0.0' + implementation 'androidx.cardview:cardview:1.0.0' implementation project(path: ':shapeshifter') } -- cgit v1.2.3 From d56686f1d5f5aa96d4c13c8bde48e6e4e9729e4f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 17 Mar 2020 11:39:02 +0100 Subject: add missing AndroidX dependency --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 5824addd..34111828 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -325,6 +325,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.multidex:multidex:2.0.0' implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation project(path: ':shapeshifter') } -- cgit v1.2.3