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

firebase · Dec 6, 2024 · 4ca5627 · 4ca5627
2 parents cf20a80 + bbb2214
commit 4ca5627
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/encoders/firebase-decoders-json/firebase-decoders-json.gradle b/encoders/firebase-decoders-json/firebase-decoders-json.gradle
@@ -45,13 +45,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 
-    testImplementation 'androidx.test:runner:1.2.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.13-rc-1'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
 

diff --git a/encoders/firebase-encoders-json/firebase-encoders-json.gradle b/encoders/firebase-encoders-json/firebase-encoders-json.gradle
@@ -51,13 +51,13 @@ android {
 dependencies {
     api 'com.google.firebase:firebase-encoders:17.0.0'
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 
-    testImplementation 'androidx.test:runner:1.3.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
-    testImplementation "com.google.truth:truth:1.0.1"
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation libs.truth
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
 

diff --git a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
@@ -48,12 +48,12 @@ 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
 
-    testImplementation 'androidx.test:runner:1.3.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
-    testImplementation 'com.google.truth:truth:1.0.1'
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation libs.truth
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
diff --git a/encoders/firebase-encoders/firebase-encoders.gradle b/encoders/firebase-encoders/firebase-encoders.gradle
@@ -30,10 +30,10 @@ java {
 
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.13'
+    testImplementation libs.junit
 }
 
 tasks.withType(JavaCompile) {

diff --git a/encoders/protoc-gen-firebase-encoders/tests/tests.gradle b/encoders/protoc-gen-firebase-encoders/tests/tests.gradle
@@ -52,6 +52,6 @@ dependencies {
     testImplementation project(":encoders:firebase-encoders")
     testImplementation project(":encoders:firebase-encoders-proto")
     testImplementation libs.protobuf.java
-    testImplementation "com.google.truth:truth:1.0.1"
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation libs.truth
+    testImplementation libs.junit
 }