Merge branch 'main' into strictmode_diskread_violation

Author: tejasd

firebase-functions/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+- [changed] Bumped dependency on OkHTTP to version 4.12.0 from version 3.12.13. If your app depends
+  on OkHTTP version 3.x the change is both binary- and Java source-compatible, with a few small
+  exceptions. See https://square.github.io/okhttp/changelogs/upgrading_to_okhttp_4/ for more
+  details.
+
 # 22.0.1
 
 - [changed] Bumped internal dependencies.

firebase-functions/gradle.properties

@@ -1,3 +1,3 @@
-version=22.0.2
+version=22.1.0
 latestReleasedVersion=22.0.1
 android.enableUnitTestBinaryResources=true

firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.kt

@@ -38,10 +38,10 @@ import java.util.concurrent.Executor
 import javax.inject.Named
 import okhttp3.Call
 import okhttp3.Callback
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.json.JSONException
 import org.json.JSONObject
@@ -87,7 +87,7 @@ internal constructor(
       try {
         URL(regionOrCustomDomain)
         false
-      } catch (malformedURLException: MalformedURLException) {
+      } catch (_: MalformedURLException) {
         true
       }
     if (isRegion) {
@@ -227,8 +227,8 @@ internal constructor(
     val encoded = serializer.encode(data)
     body["data"] = encoded
     val bodyJSON = JSONObject(body)
-    val contentType = MediaType.parse("application/json")
-    val requestBody = RequestBody.create(contentType, bodyJSON.toString())
+    val contentType = "application/json".toMediaTypeOrNull()
+    val requestBody = bodyJSON.toString().toRequestBody(contentType)
     var request = Request.Builder().url(url).post(requestBody)
     if (context!!.authToken != null) {
       request = request.header("Authorization", "Bearer " + context.authToken)
@@ -268,8 +268,8 @@ internal constructor(
 
         @Throws(IOException::class)
         override fun onResponse(ignored: Call, response: Response) {
-          val code = fromHttpStatus(response.code())
-          val bodyAsString = response.body()!!.string()
+          val code = fromHttpStatus(response.code)
+          val bodyAsString = response.body!!.string()
           val exception = fromResponse(code, bodyAsString, serializer)
           if (exception != null) {
             tcs.setException(exception)

firebase-functions/src/main/java/com/google/firebase/functions/PublisherStream.kt

@@ -28,7 +28,7 @@ import java.util.concurrent.Executor
 import java.util.concurrent.atomic.AtomicLong
 import okhttp3.Call
 import okhttp3.Callback
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
@@ -133,7 +133,7 @@ internal class PublisherStream(
       val configuredClient = options.apply(client)
       val requestBody =
         RequestBody.create(
-          MediaType.parse("application/json"),
+          "application/json".toMediaTypeOrNull(),
           JSONObject(mapOf("data" to serializer.encode(data))).toString()
         )
       val request =
@@ -167,7 +167,7 @@ internal class PublisherStream(
 
           override fun onResponse(call: Call, response: Response) {
             validateResponse(response)
-            val bodyStream = response.body()?.byteStream()
+            val bodyStream = response.body?.byteStream()
             if (bodyStream != null) {
               processSSEStream(bodyStream)
             } else {
@@ -309,21 +309,21 @@ internal class PublisherStream(
 
     val errorMessage: String
     if (
-      response.code() == 404 &&
-        MediaType.parse(response.header("Content-Type") ?: "")?.subtype() == "html"
+      response.code == 404 &&
+        (response.header("Content-Type") ?: "").toMediaTypeOrNull()?.subtype == "html"
     ) {
-      errorMessage = """URL not found. Raw response: ${response.body()?.string()}""".trimMargin()
+      errorMessage = """URL not found. Raw response: ${response.body?.string()}""".trimMargin()
       notifyError(
         FirebaseFunctionsException(
           errorMessage,
-          FirebaseFunctionsException.Code.fromHttpStatus(response.code()),
+          FirebaseFunctionsException.Code.fromHttpStatus(response.code),
           null
         )
       )
       return
     }
 
-    val text = response.body()?.string() ?: ""
+    val text = response.body?.string() ?: ""
     val error: Any?
     try {
       val json = JSONObject(text)

firebase-perf/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+- [changed] Bumped dependency on OkHTTP to version 4.12.0 from version 3.12.13. If your app depends
+  on OkHTTP version 3.x the change is both binary- and Java source-compatible, with a few small
+  exceptions. See https://square.github.io/okhttp/changelogs/upgrading_to_okhttp_4/ for more
+  details.
+
 # 22.0.2
 
 - [changed] Bumped internal dependencies.

gradle/libs.versions.toml

@@ -163,14 +163,14 @@ maven-resolver-provider = { module = "org.apache.maven:maven-resolver-provider",
 maven-resolver-transport-file = { module = "org.apache.maven.resolver:maven-resolver-transport-file", version.ref = "mavenResolverApi" }
 maven-resolver-transport-http = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "mavenResolverApi" }
 maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util", version.ref = "mavenResolverApi" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version = "3.12.13" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.12.0" }
 org-json = { module = "org.json:json", version = "20240303" }
 play-services-cloud-messaging = { module = "com.google.android.gms:play-services-cloud-messaging", version.ref = "playServicesCloudMessaging" }
 play-services-stats = { module = "com.google.android.gms:play-services-stats", version.ref = "playServicesStats" }
 play-services-vision = { module = "com.google.android.gms:play-services-vision", version.ref = "playServicesVision" }
-playservices-base = { module = "com.google.android.gms:play-services-base", version = "18.1.0" }
-playservices-basement = { module = "com.google.android.gms:play-services-basement", version = "18.8.0" }
-playservices-tasks = { module = "com.google.android.gms:play-services-tasks", version = "18.1.0" }
+playservices-base = { module = "com.google.android.gms:play-services-base", version = "18.9.0" }
+playservices-basement = { module = "com.google.android.gms:play-services-basement", version = "18.9.0" }
+playservices-tasks = { module = "com.google.android.gms:play-services-tasks", version = "18.4.0" }
 proto-google-common-protos = { module = "com.google.api.grpc:proto-google-common-protos", version.ref = "protoGoogleCommonProtos" }
 protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "javalite" }
 protobuf-java-lite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "javalite" }