Removed deprecated public constructor

Author: themiswang

firebase-crashlytics/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+[changed] **Breaking Change**: Removed deprecated public constructor `KeyValueBuilder(crashlytics: FirebaseCrashlytics)`
 
 # 19.4.2
 * [changed] Internal changes to read version control info more efficiently [#6754]

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt

@@ -83,22 +83,6 @@ class CrashlyticsTests {
     assertThat(result).isEqualTo(expectedKeys)
   }
 
-  @Test
-  fun keyValueBuilder_withCrashlyticsInstance() {
-    @Suppress("DEPRECATION") val keyValueBuilder = KeyValueBuilder(Firebase.crashlytics)
-    keyValueBuilder.key("string", "world")
-    keyValueBuilder.key("int", Int.MAX_VALUE)
-    keyValueBuilder.key("float", Float.MAX_VALUE)
-    keyValueBuilder.key("boolean", true)
-    keyValueBuilder.key("double", Double.MAX_VALUE)
-    keyValueBuilder.key("long", Long.MAX_VALUE)
-
-    val result: Map<String, String> = keyValueBuilder.build().keysAndValues
-
-    // The result is empty because it called crashlytics.setCustomKey for every key.
-    assertThat(result).isEmpty()
-  }
-
   companion object {
     private const val APP_ID = "1:1:android:1a"
     private const val API_KEY = "API-KEY-API-KEY-API-KEY-API-KEY-API-KEY"

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt

@@ -19,45 +19,39 @@ package com.google.firebase.crashlytics
 /** Helper class to enable convenient syntax in [setCustomKeys] and [recordException] */
 class KeyValueBuilder
 private constructor(
-  private val crashlytics: FirebaseCrashlytics?,
   private val builder: CustomKeysAndValues.Builder,
 ) {
-  @Deprecated(
-    "Do not construct this directly. Use `setCustomKeys` instead. To be removed in the next major release."
-  )
-  constructor(crashlytics: FirebaseCrashlytics) : this(crashlytics, CustomKeysAndValues.Builder())
-
-  internal constructor() : this(crashlytics = null, CustomKeysAndValues.Builder())
+  internal constructor() : this(CustomKeysAndValues.Builder())
 
   internal fun build(): CustomKeysAndValues = builder.build()
 
   /** Sets a custom key and value that are associated with reports. */
   fun key(key: String, value: Boolean) {
-    crashlytics?.setCustomKey(key, value) ?: builder.putBoolean(key, value)
+    builder.putBoolean(key, value)
   }
 
   /** Sets a custom key and value that are associated with reports. */
   fun key(key: String, value: Double) {
-    crashlytics?.setCustomKey(key, value) ?: builder.putDouble(key, value)
+    builder.putDouble(key, value)
   }
 
   /** Sets a custom key and value that are associated with reports. */
   fun key(key: String, value: Float) {
-    crashlytics?.setCustomKey(key, value) ?: builder.putFloat(key, value)
+    builder.putFloat(key, value)
   }
 
   /** Sets a custom key and value that are associated with reports. */
   fun key(key: String, value: Int) {
-    crashlytics?.setCustomKey(key, value) ?: builder.putInt(key, value)
+    builder.putInt(key, value)
   }
 
   /** Sets a custom key and value that are associated with reports. */
   fun key(key: String, value: Long) {
-    crashlytics?.setCustomKey(key, value) ?: builder.putLong(key, value)
+    builder.putLong(key, value)
   }
 
   /** Sets a custom key and value that are associated with reports. */
   fun key(key: String, value: String) {
-    crashlytics?.setCustomKey(key, value) ?: builder.putString(key, value)
+    builder.putString(key, value)
   }
 }