Merge branch 'master' into robolectric-4.11.x

robolectric · Oct 19, 2023 · 1341c57 · 1341c57
2 parents 8ce1732 + d75572b
commit 1341c57
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    ignore:
+       # don't auto update guava since it requires updating gradle
+       - dependency-name: "*guava*"
+       # don't auto update errorprone since it requires updating guava
+       - dependency-name: "*errorprone*"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ hamcrest = "2.0.0.0"
 aggregate-javadocs-gradle = "3.0.1"
 
 # https://github.com/google/error-prone/releases
-error-prone = "2.22.0"
+error-prone = "2.19.1"
 error-prone-javac = "9+181-r4173-1"
 
 # https://github.com/tbroyer/gradle-errorprone-plugin/releases
@@ -54,7 +54,7 @@ auto-value = "1.10.4"
 compile-testing = "0.21.0"
 
 # https://github.com/google/guava/releases
-guava-jre = "32.1.3-jre"
+guava-jre = "31.1-jre"
 
 # https://github.com/google/gson/releases
 gson = "2.10.1"