Merge remote-tracking branch 'origin/main' into LogLevelFlow

firebase-abt/firebase-abt.gradle

@@ -55,18 +55,18 @@ dependencies {
     api 'com.google.firebase:firebase-common:21.0.0'
     api 'com.google.firebase:firebase-components:18.0.0'
 
-    implementation 'com.google.android.gms:play-services-basement:18.1.0'
+    implementation libs.playservices.basement
     implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
 
     implementation(libs.kotlin.stdlib.jdk8)
 
-    testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    testImplementation 'com.google.truth:truth:0.44'
-    testImplementation 'io.grpc:grpc-testing:1.12.0'
-    testImplementation 'junit:junit:4.13-beta-2'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.androidx.test.runner
+    testImplementation libs.androidx.espresso.core
+    testImplementation libs.truth
+    testImplementation libs.grpc.testing
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }

firebase-appdistribution-api/firebase-appdistribution-api.gradle

@@ -52,29 +52,29 @@ android {
 }
 
 dependencies {
-    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api libs.playservices.tasks
     api("com.google.firebase:firebase-common:21.0.0")
     api("com.google.firebase:firebase-common-ktx:21.0.0")
     api("com.google.firebase:firebase-components:18.0.0")
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
     implementation libs.kotlin.stdlib
 
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+    compileOnly libs.autovalue.annotations
 
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+    annotationProcessor libs.autovalue
 
     testImplementation project(':firebase-appdistribution-api')
     testImplementation libs.androidx.test.core
     testImplementation libs.truth
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-inline:3.4.0'
+    testImplementation libs.mockito.core
+    testImplementation libs.mockito.mockito.inline
     testImplementation libs.robolectric
 
     androidTestImplementation libs.androidx.test.core
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "org.mockito:mockito-android:3.4.0"
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.mockito.android
 }

firebase-appdistribution/firebase-appdistribution.gradle

@@ -73,14 +73,14 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
 
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation "androidx.browser:browser:1.3.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.browser
+    implementation libs.androidx.constraintlayout
+    implementation libs.playservices.tasks
     implementation libs.javax.inject
     implementation libs.kotlin.stdlib.jdk8
 
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+    compileOnly libs.autovalue.annotations
 
     runtimeOnly('com.google.firebase:firebase-installations:17.1.3') {
         exclude group: 'com.google.firebase', module: 'firebase-common'
@@ -98,18 +98,18 @@ dependencies {
     testImplementation libs.androidx.test.core
     testImplementation libs.truth
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation libs.mockito.mockito.inline
     testImplementation libs.robolectric
 
     androidTestImplementation(project(":integ-testing")){
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
-    androidTestImplementation "androidx.annotation:annotation:1.0.0"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.annotation
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.mockito.core
+    androidTestImplementation libs.mockito.mockito.inline
 }

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java

@@ -18,6 +18,7 @@
 import static com.google.firebase.appdistribution.impl.FirebaseAppDistributionNotificationsManager.NotificationType.FEEDBACK;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -97,6 +98,9 @@ enum NotificationType {
     this.uiThreadExecutor = uiThreadExecutor;
   }
 
+  // Suppress lint as `areNotificationsEnabled()` verifies whether the notification can be send,
+  // including API 33+. Developers are expected to ask for notification permissions themselves.
+  @SuppressLint("MissingPermission")
   void showAppUpdateNotification(long totalBytes, long downloadedBytes, int stringResourceId) {
     // Create the NotificationChannel, but only on API 26+ because
     // the NotificationChannel class is new and not in the support library
@@ -179,7 +183,8 @@ public void showFeedbackNotification(
         });
   }
 
-  // this must be run on the main (UI) thread
+  // This must be run on the main (UI) thread.
+  @SuppressLint("MissingPermission")
   private void doShowFeedbackNotification() {
     LogWrapper.i(TAG, "Showing feedback notification");
     notificationManager.notify(FEEDBACK.tag, FEEDBACK.id, feedbackNotificationToBeShown);

firebase-config/bandwagoner/bandwagoner.gradle

@@ -68,7 +68,7 @@ firebaseTestLab {
 }
 
 dependencies {
-    api 'com.google.auto.value:auto-value-annotations:1.6.5'
+    api libs.autovalue.annotations
 
     // Depend on development artifacts for Remote Config.
     implementation(project(":firebase-config")) {
@@ -83,14 +83,14 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core:1.0.2'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
-    implementation 'com.google.android.gms:play-services-basement:18.1.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation libs.androidx.annotation
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.core
+    implementation libs.androidx.legacy.support.v4
+    implementation libs.androidx.espresso.idling.resource
+    implementation libs.playservices.basement
+    implementation libs.playservices.tasks
+    implementation libs.material
     // This is required since a `project` dependency on frc does not expose the APIs of its
     // "implementation" dependencies. The alternative would be to make common an "api" dep of remote-config.
     // Released artifacts don't need these dependencies since they don't use `project` to refer
@@ -104,12 +104,12 @@ dependencies {
     }
     // Support Libraries
     implementation 'com.google.guava:guava:28.1-android'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4"
+    implementation libs.kotlinx.coroutines.core
 
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
+    annotationProcessor libs.autovalue
 
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
+    androidTestImplementation libs.androidx.test.rules
+    androidTestImplementation libs.androidx.test.runner
+    androidTestImplementation libs.androidx.espresso.core
+    androidTestImplementation libs.androidx.espresso.idling.resource
 }

firebase-config/firebase-config.gradle.kts

@@ -78,13 +78,13 @@ dependencies {
 
   // Kotlin & Android
   implementation(libs.kotlin.stdlib)
-  implementation("androidx.annotation:annotation:1.1.0")
-  api("com.google.android.gms:play-services-tasks:18.0.1")
+  implementation(libs.androidx.annotation)
+  api(libs.playservices.tasks)
 
   // Annotations and static analysis
-  annotationProcessor("com.google.auto.value:auto-value:1.6.6")
-  javadocClasspath("com.google.auto.value:auto-value-annotations:1.6.6")
-  compileOnly("com.google.auto.value:auto-value-annotations:1.6.6")
+  annotationProcessor(libs.autovalue)
+  javadocClasspath(libs.autovalue.annotations)
+  compileOnly(libs.autovalue.annotations)
   compileOnly(libs.findbugs.jsr305)
 
   // Testing
@@ -95,13 +95,13 @@ dependencies {
   testImplementation(libs.robolectric)
   testImplementation(libs.mockito.core)
   testImplementation(libs.truth)
-  testImplementation("org.skyscreamer:jsonassert:1.5.0")
+  testImplementation(libs.jsonassert)
 
   androidTestImplementation(libs.truth)
   androidTestImplementation(libs.junit)
   androidTestImplementation(libs.mockito.core)
   androidTestImplementation(libs.androidx.test.runner)
-  androidTestImplementation("org.skyscreamer:jsonassert:1.5.0")
-  androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1")
-  androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.1")
+  androidTestImplementation(libs.jsonassert)
+  androidTestImplementation(libs.mockito.dexmaker)
+  androidTestImplementation(libs.dexmaker)
 }

firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle

@@ -117,15 +117,15 @@ dependencies {
 
     implementation libs.playservices.basement
 
-    testImplementation 'androidx.test:runner:1.4.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-core:3.4.3'
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
     androidTestImplementation libs.androidx.test.core
-    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.protobuf.java.lite
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
-    androidTestImplementation 'org.mockito:mockito-core:3.4.3'
+    androidTestImplementation libs.dexmaker
+    androidTestImplementation libs.mockito.dexmaker
+    androidTestImplementation libs.mockito.core
 }

firebase-crashlytics/firebase-crashlytics.gradle

@@ -106,9 +106,9 @@ dependencies {
     androidTestImplementation("com.google.firebase:firebase-encoders-json:18.0.1")
     androidTestImplementation(libs.protobuf.java)
     androidTestImplementation(libs.truth)
-    androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.3")
+    androidTestImplementation(libs.dexmaker)
     androidTestImplementation(libs.mockito.dexmaker)
-    androidTestImplementation("org.mockito:mockito-core:4.7.0")
+    androidTestImplementation(libs.mockito.core)
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.truth)

firebase-database/firebase-database.gradle.kts

@@ -80,8 +80,8 @@ dependencies {
   implementation(libs.kotlinx.coroutines.core)
   api(libs.playservices.tasks)
 
-  testImplementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
-  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")
+  testImplementation(libs.jackson.core)
+  testImplementation(libs.jackson.databind)
   testImplementation("com.firebase:firebase-token-generator:2.0.0")
   testImplementation(libs.androidx.test.core)
   testImplementation(libs.androidx.test.rules)
@@ -91,10 +91,10 @@ dependencies {
   testImplementation(libs.robolectric)
   testImplementation(libs.truth)
 
-  androidTestImplementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
-  androidTestImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")
-  androidTestImplementation("org.hamcrest:hamcrest:2.2")
-  androidTestImplementation("org.hamcrest:hamcrest-library:2.2")
+  androidTestImplementation(libs.jackson.core)
+  androidTestImplementation(libs.jackson.databind)
+  androidTestImplementation(libs.hamcrest)
+  androidTestImplementation(libs.hamcrest.library)
   androidTestImplementation(libs.androidx.test.junit)
   androidTestImplementation(libs.androidx.test.runner)
   androidTestImplementation(libs.junit)

firebase-datatransport/firebase-datatransport.gradle

@@ -52,15 +52,15 @@ dependencies {
     api 'com.google.firebase:firebase-common:21.0.0'
     api 'com.google.firebase:firebase-components:18.0.0'
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
     implementation 'com.google.android.datatransport:transport-api:3.1.0'
     implementation 'com.google.android.datatransport:transport-backend-cct:3.2.0'
     implementation 'com.google.android.datatransport:transport-runtime:3.2.0'
     implementation(libs.kotlin.stdlib.jdk8)
 
     testImplementation libs.androidx.test.core
-    testImplementation 'androidx.test:runner:1.2.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
+    testImplementation libs.junit
     testImplementation libs.robolectric
 }

firebase-dynamic-links/firebase-dynamic-links.gradle

@@ -59,11 +59,11 @@ android {
 }
 
 dependencies {
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath libs.autovalue.annotations
     javadocClasspath libs.findbugs.jsr305
-    javadocClasspath 'org.checkerframework:checker-qual:2.5.2'
+    javadocClasspath libs.checker.qual
 
-    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api libs.playservices.tasks
     api('com.google.firebase:firebase-auth-interop:20.0.0') {
          exclude group: "com.google.firebase", module: "firebase-common"
      }
@@ -74,27 +74,27 @@ dependencies {
          exclude group: 'com.google.firebase', module: 'firebase-common'
      }
 
-    implementation 'androidx.annotation:annotation:1.2.0'
+    implementation libs.androidx.annotation
     implementation libs.playservices.base
     implementation libs.playservices.basement
     implementation libs.kotlin.stdlib
 
-    testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3"
+    testAnnotationProcessor libs.autovalue
 
     testImplementation libs.androidx.test.core
-    testImplementation 'com.android.support.test:runner:1.0.2'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2'
+    testImplementation libs.runner
+    testImplementation libs.jackson.databind
     testImplementation('com.google.android.gms:play-services-appinvite:18.0.0') {
          exclude group: 'com.google.firebase', module: 'firebase-common'
          exclude group: 'com.google.firebase', module: 'firebase-dynamic-links'
      }
     testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
-    testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3'
+    testCompileOnly libs.autovalue.annotations
 }

firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/PendingDynamicLinkDataTest.java

@@ -21,7 +21,7 @@
 import static junit.framework.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;

firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImplTest.java

@@ -20,7 +20,7 @@
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
 import android.content.Intent;