Merge remote-tracking branch 'origin/master' into OverlayNeverNull

dconeybe · dconeybe · commit c07a98e055d4 · 2022-03-16T14:11:42.000-04:00
diff --git a/firebase-messaging-directboot/firebase-messaging-directboot.gradle b/firebase-messaging-directboot/firebase-messaging-directboot.gradle
@@ -67,7 +67,5 @@ dependencies {
     }
     implementation 'com.google.firebase:firebase-measurement-connector:18.0.0'
     implementation "com.google.firebase:firebase-iid-interop:17.0.0"
-    implementation ("com.google.api-client:google-api-client:1.30.9") {
-        exclude group: "org.apache.httpcomponents", module: "httpclient"
-    }
+    implementation "com.google.errorprone:error_prone_annotations:2.9.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,5 @@ dependencies {`
`67`	`67`	`}`
`68`	`68`	`implementation 'com.google.firebase:firebase-measurement-connector:18.0.0'`
`69`	`69`	`implementation "com.google.firebase:firebase-iid-interop:17.0.0"`
`70`		`- implementation ("com.google.api-client:google-api-client:1.30.9") {`
`71`		`- exclude group: "org.apache.httpcomponents", module: "httpclient"`
`72`		`- }`
	`70`	`+ implementation "com.google.errorprone:error_prone_annotations:2.9.0"`
`73`	`71`	`}`