Replace hardcoded android.annotation declarations with catalog

Author: rlazo

encoders/firebase-encoders-processor/firebase-encoders-processor.gradle

@@ -44,7 +44,7 @@ configurations.testImplementation.resolutionStrategy {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 }
 
 test {

encoders/firebase-encoders-proto/firebase-encoders-proto.gradle

@@ -19,7 +19,7 @@ plugins {
 
 firebaseLibrary {
     publishJavadoc = false
-    releaseNotes { 
+    releaseNotes {
         enabled.set(false)
     }
 }
@@ -39,7 +39,7 @@ protobuf {
 dependencies {
     api 'com.google.firebase:firebase-encoders:17.0.0'
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 
     annotationProcessor project(':encoders:firebase-encoders-processor')
 

firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle

@@ -100,7 +100,7 @@ dependencies {
     api("com.google.firebase:firebase-installations:17.2.0")
     api 'com.google.firebase:firebase-installations-interop:17.1.0'
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
     implementation 'com.google.android.datatransport:transport-api:3.0.0'
     implementation 'com.google.android.datatransport:transport-runtime:3.1.8'
     implementation 'com.google.auto.service:auto-service-annotations:1.0.1'

firebase-perf/dev-app/dev-app.gradle

@@ -97,7 +97,7 @@ dependencies {
     }
 
     // Google Deps
-    implementation 'androidx.annotation:annotation:1.4.0'
+    implementation libs.androidx.annotation
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.2'
     implementation 'androidx.appcompat:appcompat:1.4.2'

firebase-perf/e2e-app/e2e-app.gradle

@@ -87,7 +87,7 @@ dependencies {
     // Google Deps
     implementation "com.google.android.gms:play-services-tasks:18.0.1"
     implementation "com.google.guava:guava:30.1.1-android"
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation 'androidx.appcompat:appcompat:1.4.0'

transport/transport-backend-cct/transport-backend-cct.gradle

@@ -20,7 +20,7 @@ plugins {
 firebaseLibrary{
     libraryGroup = "transport"
     publishJavadoc = false
-    releaseNotes { 
+    releaseNotes {
         enabled.set(false)
     }
 }
@@ -41,7 +41,7 @@ protobuf {
 }
 
 android {
-    namespace "com.google.android.datatransport.backend.cct"    
+    namespace "com.google.android.datatransport.backend.cct"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
@@ -62,7 +62,7 @@ dependencies {
     api 'com.google.firebase:firebase-encoders:17.0.0'
     api 'com.google.firebase:firebase-encoders-json:18.0.0'
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.6"
 

transport/transport-runtime-testing/transport-runtime-testing.gradle

@@ -18,7 +18,7 @@ plugins {
 }
 
 android {
-    namespace "com.google.android.datatransport.runtime.testing"    
+    namespace "com.google.android.datatransport.runtime.testing"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
@@ -35,7 +35,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation libs.androidx.annotation
     implementation 'com.google.android.datatransport:transport-api:3.0.0'
     implementation 'com.google.android.datatransport:transport-backend-cct:3.1.8'
     implementation 'com.google.android.datatransport:transport-runtime:3.1.8'

transport/transport-runtime/transport-runtime.gradle

@@ -52,7 +52,7 @@ protobuf {
 firebaseLibrary {
     libraryGroup = "transport"
     publishJavadoc = false
-    releaseNotes { 
+    releaseNotes {
         enabled.set(false)
     }
     testLab {
@@ -106,10 +106,10 @@ dependencies {
     }
 
     api "com.google.android.datatransport:transport-api:4.0.0"
-    api 'com.google.firebase:firebase-encoders:17.0.0'
-    api "com.google.firebase:firebase-encoders-proto:16.0.0"
+    api project(":encoders:firebase-encoders")
+    api project(":encoders:firebase-encoders-proto")
 
-    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation libs.androidx.annotation
     implementation libs.javax.inject
 
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.6"