Skip to content

main #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

main #425

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions ui/espresso/IntentsBasicSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

}
7 changes: 3 additions & 4 deletions ui/espresso/IntentsBasicSample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
3 changes: 1 addition & 2 deletions ui/espresso/IntentsBasicSample/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down