From f185392faad1612484e2f55973645b412d4a8e28 Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 27 Jan 2022 16:49:28 +0530 Subject: [PATCH 1/2] Update to latest dependencies --- ui/espresso/IntentsBasicSample/build.gradle | 7 +++---- ui/espresso/IntentsBasicSample/gradle.properties | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ui/espresso/IntentsBasicSample/build.gradle b/ui/espresso/IntentsBasicSample/build.gradle index a07cb8189..7aef6ac4c 100644 --- a/ui/espresso/IntentsBasicSample/build.gradle +++ b/ui/espresso/IntentsBasicSample/build.gradle @@ -25,14 +25,13 @@ allprojects { ext { buildToolsVersion = "31.0.0" - androidxAnnotationVersion = "1.2.0" - androidxCoreVersion = "1.6.0" + androidxAnnotationVersion = "1.3.0" + androidxCoreVersion = "1.7.0" coreVersion = "1.4.1-alpha03" extJUnitVersion = "1.1.4-alpha03" runnerVersion = "1.4.1-alpha03" rulesVersion = "1.4.1-alpha03" espressoVersion = "3.5.0-alpha03" - extJUnitVersion = "1.1.4-alpha03" extTruthVersion = "1.5.0-alpha03" - robolectricVersion = "4.6.1" + robolectricVersion = "4.7.3" } diff --git a/ui/espresso/IntentsBasicSample/gradle.properties b/ui/espresso/IntentsBasicSample/gradle.properties index 413608a46..227f48064 100644 --- a/ui/espresso/IntentsBasicSample/gradle.properties +++ b/ui/espresso/IntentsBasicSample/gradle.properties @@ -15,8 +15,7 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -android.useAndroidX=true +# org.gradle.parallel=true android.enableJetifier=true android.useAndroidX=true From fdab57d7b926d6fd724ff74a17250c73f26c4e7b Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 27 Jan 2022 16:51:31 +0530 Subject: [PATCH 2/2] Update to latest dependencies --- .../IntentsBasicSample/app/build.gradle | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/ui/espresso/IntentsBasicSample/app/build.gradle b/ui/espresso/IntentsBasicSample/app/build.gradle index 5eb8370d0..0f983c0c8 100644 --- a/ui/espresso/IntentsBasicSample/app/build.gradle +++ b/ui/espresso/IntentsBasicSample/app/build.gradle @@ -36,26 +36,25 @@ android { dependencies { // App dependencies - implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion; - implementation 'androidx.core:core:' + rootProject.androidxCoreVersion; + implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion + implementation 'androidx.core:core:' + rootProject.androidxCoreVersion // Testing-only dependencies - androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion; - androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion; - androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion; - androidTestImplementation 'androidx.test:rules:' + rootProject.rulesVersion; - androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion; - androidTestImplementation 'androidx.test.espresso:espresso-intents:' + rootProject.espressoVersion; - androidTestImplementation 'androidx.test.ext:truth:' + rootProject.extTruthVersion; - androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion; - androidTestImplementation 'org.robolectric:annotations:' + rootProject.robolectricVersion; + androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion + androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion + androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion + androidTestImplementation 'androidx.test:rules:' + rootProject.rulesVersion + androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion + androidTestImplementation 'androidx.test.espresso:espresso-intents:' + rootProject.espressoVersion + androidTestImplementation 'androidx.test.ext:truth:' + rootProject.extTruthVersion + androidTestImplementation 'org.robolectric:annotations:' + rootProject.robolectricVersion - testImplementation 'androidx.test:core:' + rootProject.coreVersion; - testImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion; - testImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion; - testImplementation 'androidx.test.espresso:espresso-intents:' + rootProject.espressoVersion; - testImplementation 'androidx.test.ext:truth:' + rootProject.extTruthVersion; - testImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion; - testImplementation 'org.robolectric:robolectric:' + rootProject.robolectricVersion; + testImplementation 'androidx.test:core:' + rootProject.coreVersion + testImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion + testImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion + testImplementation 'androidx.test.espresso:espresso-intents:' + rootProject.espressoVersion + testImplementation 'androidx.test.ext:truth:' + rootProject.extTruthVersion + testImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion + testImplementation 'org.robolectric:robolectric:' + rootProject.robolectricVersion }