Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(android, api31): use api31 compatible transitive androidx deps #3055

Closed
wants to merge 2 commits into from
Closed

fix(android, api31): use api31 compatible transitive androidx deps #3055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
808f4df
fix(android, api31): use api31 compatible transitive androidx deps
mikehardy Nov 4, 2021
6c51e79
build(android, deps): use more recent gradle plugin for rn<64
mikehardy Nov 5, 2021
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
12 changes: 6 additions & 6 deletions detox/android/detox/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ dependencies {
// All are aligned with this release: https://developer.android.com/jetpack/androidx/releases/test#1.2.0
dependencies {

// Versions are in-sync with the 'androidx-test-1.2.0' release/tag of the android-test github repo,
// used by the Detox generator. See https://github.com/android/android-test/releases/tag/androidx-test-1.2.0
// Versions are in-sync with the 'androidx-test-1.4.0' release/tag of the android-test github repo,
// used by the Detox generator. See https://github.com/android/android-test/releases/tag/androidx-test-1.4.0
// Important: Should remain so when generator tag is replaced!
api('androidx.test.espresso:espresso-core:3.3.0') { // Needed all across Detox but also makes Espresso seamlessly provided to Detox users with hybrid apps/E2E-tests.
api('androidx.test.espresso:espresso-core:3.4.0') { // Needed all across Detox but also makes Espresso seamlessly provided to Detox users with hybrid apps/E2E-tests.
exclude group: 'com.google.code.findbugs', module: 'jsr305'
}
api 'androidx.test.espresso:espresso-web:3.3.0' // Web-View testing
api 'androidx.test:rules:1.2.0' // Needed because of ActivityTestRule. Needed by users *and* internally used by Detox.
api 'androidx.test.ext:junit:1.1.1' // Needed so as to seamlessly provide AndroidJUnit4 to Detox users. Depends on junit core.
api 'androidx.test.espresso:espresso-web:3.4.0' // Web-View testing
api 'androidx.test:rules:1.4.0' // Needed because of ActivityTestRule. Needed by users *and* internally used by Detox.
api 'androidx.test.ext:junit:1.1.3' // Needed so as to seamlessly provide AndroidJUnit4 to Detox users. Depends on junit core.

// Version is the latest; Cannot sync with the Github repo (e.g. android/android-test) because the androidx
// packaging version of associated classes is simply not there...
Expand Down
4 changes: 1 addition & 3 deletions detox/test/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ buildscript {
def androidGradlePluginVersion =
rnInfo.isRN64OrHigher
? '4.1.0'
: rnInfo.isRN62OrHigher
? '3.5.3'
: '3.4.2'
: '3.6.4'
println "[$project] Resorted to Android Gradle-plugin version $androidGradlePluginVersion"

ext {
Expand Down