Merge branch 'main' into strictmode_diskread_violation

OOS93 · web-flow · commit 8b2868109396 · 2025-10-09T20:15:51.000-06:00
diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle
@@ -53,7 +53,8 @@ android {
 }
 
 thirdPartyLicenses {
-    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Dagger', "${rootDir}/third_party/licenses/dagger.txt"
 }
 
 dependencies {
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -105,7 +105,8 @@ android {
 }
 
 thirdPartyLicenses {
-    add 'Crashpad', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Crashpad', "${rootDir}/third_party/licenses/crashpad.txt"
 }
 
 dependencies {
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -63,7 +63,8 @@ android {
 kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }
 
 thirdPartyLicenses {
-    add 'Tape', "${projectDir}/third_party_licenses/tape/LICENSE"
+    add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Tape', "${rootDir}/third_party/licenses/tape.txt"
 }
 
 dependencies {
diff --git a/firebase-crashlytics/third_party_licenses/tape/LICENSE b/firebase-crashlytics/third_party_licenses/tape/LICENSE
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
@@ -161,7 +161,7 @@ dependencies {
     testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
     testImplementation libs.truth
     testImplementation libs.junit
-    testImplementation libs.hamcrest.junit
+    testImplementation libs.hamcrest
     testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts
@@ -62,7 +62,10 @@ kotlin {
   explicitApi()
 }
 
-thirdPartyLicenses { add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") }
+thirdPartyLicenses {
+  add("Apache-2.0", "${rootDir}/third_party/licenses/apache-2.0.txt")
+  add("Dagger", "${rootDir}/third_party/licenses/dagger.txt")
+}
 
 dependencies {
   javadocClasspath("org.codehaus.mojo:animal-sniffer-annotations:1.21")
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -81,7 +81,8 @@ android {
 kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }
 
 thirdPartyLicenses {
-    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Dagger', "${rootDir}/third_party/licenses/dagger.txt"
 }
 
 dependencies {
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -105,7 +105,8 @@ android {
 kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }
 
 thirdPartyLicenses {
-    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Dagger', "${rootDir}/third_party/licenses/dagger.txt"
 }
 
 dependencies {
diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
@@ -79,7 +79,8 @@ android {
 kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }
 
 thirdPartyLicenses {
-    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Dagger', "${rootDir}/third_party/licenses/dagger.txt"
 }
 
 dependencies {
diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts
@@ -67,7 +67,10 @@ kotlin {
   compilerOptions { jvmTarget = JvmTarget.JVM_1_8 }
 }
 
-thirdPartyLicenses { add("dagger2", "${projectDir}/third_party/dagger2/LICENSE") }
+thirdPartyLicenses {
+  add("Apache-2.0", "${rootDir}/third_party/licenses/apache-2.0.txt")
+  add("Dagger", "${rootDir}/third_party/licenses/dagger.txt")
+}
 
 dependencies {
   api(libs.firebase.common)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -34,9 +34,8 @@ googleServices = "4.3.15"
 gradleErrorpronePlugin = "4.2.0"
 grpc = "1.62.2"
 grpcKotlin = "1.4.1"
-hamcrest = "2.2"
-hamcrestJunit = "2.0.0.0"
-hamcrestLibrary = "2.2"
+hamcrest = "3.0"
+hamcrestLibrary = "3.0"
 httpclientAndroid = "4.3.5.1"
 integrity = "1.4.0"
 jacksonCore = "2.13.1"
@@ -129,7 +128,6 @@ grpc-protoc-gen-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.re
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
 grpc-testing = { module = "io.grpc:grpc-testing", version.ref = "grpc" }
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
-hamcrest-junit = { module = "org.hamcrest:hamcrest-junit", version.ref = "hamcrestJunit" }
 hamcrest-library = { module = "org.hamcrest:hamcrest-library", version.ref = "hamcrestLibrary" }
 httpclient-android = { module = "org.apache.httpcomponents:httpclient-android", version.ref = "httpclientAndroid" }
 integrity = { module = "com.google.android.play:integrity", version.ref = "integrity" }
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
@@ -59,7 +59,7 @@ dependencies {
   implementation(libs.org.json)
   implementation(libs.bundles.maven.resolver)
 
-  implementation("com.google.guava:guava:33.4.8-jre")
+  implementation("com.google.guava:guava:33.5.0-jre")
   implementation("org.ow2.asm:asm-tree:9.8")
   implementation("org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r")
   implementation(libs.kotlinx.serialization.json)
diff --git a/plugins/resources/dummy-google-services.json b/plugins/resources/dummy-google-services.json
@@ -0,0 +1,24 @@
+{
+  "project_info": {
+    "project_number": "000000000",
+    "firebase_url": "https://fakeProject.firebaseio.com",
+    "project_id": "fakeProject",
+    "storage_bucket": "fakeProject.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:0000000:android:fakeProjectCopyGoogleServices",
+        "android_client_info": {
+          "package_name": "com.example.myapplication"
+        }
+      },
+      "api_key": [
+        {
+          "current_key": "aFakeKeyBecauseThisWholeJsonFileIsFake"
+        }
+      ]
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt
diff --git a/third_party/licenses/crashpad.txt b/third_party/licenses/crashpad.txt
diff --git a/third_party/licenses/dagger.txt b/third_party/licenses/dagger.txt
diff --git a/third_party/licenses/tape.txt b/third_party/licenses/tape.txt
diff --git a/transport/transport-runtime/transport-runtime.gradle b/transport/transport-runtime/transport-runtime.gradle

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ android {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`thirdPartyLicenses {`
`56`		`- add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`56`	`+ add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`57`	`+ add 'Dagger', "${rootDir}/third_party/licenses/dagger.txt"`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ android {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`thirdPartyLicenses {`
`108`		`- add 'Crashpad', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`108`	`+ add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`109`	`+ add 'Crashpad', "${rootDir}/third_party/licenses/crashpad.txt"`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ android {`
`63`	`63`	`kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }`
`64`	`64`
`65`	`65`	`thirdPartyLicenses {`
`66`		`- add 'Tape', "${projectDir}/third_party_licenses/tape/LICENSE"`
	`66`	`+ add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`67`	`+ add 'Tape', "${rootDir}/third_party/licenses/tape.txt"`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ android {`
`81`	`81`	`kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }`
`82`	`82`
`83`	`83`	`thirdPartyLicenses {`
`84`		`- add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`84`	`+ add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`85`	`+ add 'Dagger', "${rootDir}/third_party/licenses/dagger.txt"`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ android {`
`79`	`79`	`kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }`
`80`	`80`
`81`	`81`	`thirdPartyLicenses {`
`82`		`- add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`82`	`+ add 'Apache-2.0', "${rootDir}/third_party/licenses/apache-2.0.txt"`
	`83`	`+ add 'Dagger', "${rootDir}/third_party/licenses/dagger.txt"`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`dependencies {`