Avoid API 24 map merge in billing address

cttsai-stripe · codex · cttsai-stripe · commit 765b70703deb · 2026-08-06T13:20:16.000-07:00
Committed-By-Agent: codex
Co-authored-by: codex &lt;noreply@openai.com&gt;
diff --git a/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/BillingAddressElement.kt b/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/BillingAddressElement.kt
@@ -254,7 +254,7 @@ class BillingAddressElement(
                 additionalFieldsByCountry = buildMap {
                     putAll(mode.additionalFieldsByCountry)
                     additionalFieldsByCountry.forEach { (countryCode, additionalFields) ->
-                        merge(countryCode, additionalFields) { existing, additional -> existing + additional }
+                        put(countryCode, get(countryCode).orEmpty() + additionalFields)
                     }
                 }
             )

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ class BillingAddressElement(`
`254`	`254`	`additionalFieldsByCountry = buildMap {`
`255`	`255`	`putAll(mode.additionalFieldsByCountry)`
`256`	`256`	`additionalFieldsByCountry.forEach { (countryCode, additionalFields) ->`
`257`		`- merge(countryCode, additionalFields) { existing, additional -> existing + additional }`
	`257`	`+ put(countryCode, get(countryCode).orEmpty() + additionalFields)`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`	`)`