Skip to content

Commit

Permalink
Try bumping all versions
Browse files Browse the repository at this point in the history
  • Loading branch information
camsim99 committed Jul 6, 2023
1 parent 624713b commit 599779c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies {
implementation "androidx.camera:camera-camera2:${camerax_version}"
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
implementation "androidx.camera:camera-video:${camerax_version}"
implementation 'com.google.guava:guava:32.0.1-android'
implementation 'com.google.guava:guava:32.1.1-android'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-inline:5.0.0'
testImplementation 'androidx.test:core:1.4.0'
Expand Down
2 changes: 1 addition & 1 deletion packages/espresso/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ android {
}

dependencies {
implementation 'com.google.guava:guava:31.1-android'
implementation 'com.google.guava:guava:32.1.1-android'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'com.google.code.gson:gson:2.10.1'
androidTestImplementation 'org.hamcrest:hamcrest:2.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-inline:5.0.0'

// TODO(camsim99): Remove this workaround when Gradle conflict is fixed: https://github.com/gradle/gradle/issues/22326.
modules {
module("com.google.guava:listenablefuture") {
replacedBy("com.google.guava:guava", "listenablefuture is part of guava")
}
}
// // TODO(camsim99): Remove this workaround when Gradle conflict is fixed: https://github.com/gradle/gradle/issues/22326.
// modules {
// module("com.google.guava:listenablefuture") {
// replacedBy("com.google.guava:guava", "listenablefuture is part of guava")
// }
// }
}

0 comments on commit 599779c

Please sign in to comment.