From 0e3aaa72c4e3f6ebe2f3e529fd740a13e032720f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jun 2026 17:14:07 +0000 Subject: [PATCH 1/2] Update guava monorepo to v33 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d34b443904..b6c1cac15f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ coroutines = "1.11.0" dokka = "2.2.0" grpc = "1.81.0" gson = "2.14.0" -guava = "32.1.3-jre" +guava = "33.6.0-jre" javapoet = "0.16.0" jimfs = "1.3.1" jmh = "1.37" From 53199578e6343343689d603b5410a8320914f374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Quenaudon?= Date: Wed, 10 Jun 2026 13:22:02 +0200 Subject: [PATCH 2/2] Fix Guava --- .../commonMain/kotlin/com/squareup/wire/schema/Multimap.kt | 2 +- .../src/jsMain/kotlin/com/squareup/wire/schema/Multimap.kt | 4 ++-- .../nativeMain/kotlin/com/squareup/wire/schema/Multimap.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/Multimap.kt b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/Multimap.kt index eab31d1e99..a9b5ef0c6d 100644 --- a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/Multimap.kt +++ b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/Multimap.kt @@ -21,7 +21,7 @@ expect interface Multimap { fun containsKey(key: Any?): Boolean fun containsValue(value: Any?): Boolean - operator fun get(key: K?): Collection + operator fun get(key: K): Collection fun values(): Collection fun asMap(): Map> } diff --git a/wire-schema/src/jsMain/kotlin/com/squareup/wire/schema/Multimap.kt b/wire-schema/src/jsMain/kotlin/com/squareup/wire/schema/Multimap.kt index 2b82fbe91d..a78bfd1384 100644 --- a/wire-schema/src/jsMain/kotlin/com/squareup/wire/schema/Multimap.kt +++ b/wire-schema/src/jsMain/kotlin/com/squareup/wire/schema/Multimap.kt @@ -20,7 +20,7 @@ actual interface Multimap { actual fun isEmpty(): Boolean actual fun containsKey(key: Any?): Boolean actual fun containsValue(value: Any?): Boolean - actual operator fun get(key: K?): Collection + actual operator fun get(key: K): Collection actual fun values(): Collection actual fun asMap(): Map> } @@ -30,7 +30,7 @@ private class SimpleMultimap(private val map: Map>) : Mul override fun isEmpty() = map.isEmpty() override fun containsKey(key: Any?) = map.containsKey(key) override fun containsValue(value: Any?) = map.values.any { it.contains(value) } - override fun get(key: K?) = map[key] ?: emptyList() + override fun get(key: K) = map[key] ?: emptyList() override fun values() = map.values.flatten() override fun asMap() = map } diff --git a/wire-schema/src/nativeMain/kotlin/com/squareup/wire/schema/Multimap.kt b/wire-schema/src/nativeMain/kotlin/com/squareup/wire/schema/Multimap.kt index b23c3d2c2a..c448d03425 100644 --- a/wire-schema/src/nativeMain/kotlin/com/squareup/wire/schema/Multimap.kt +++ b/wire-schema/src/nativeMain/kotlin/com/squareup/wire/schema/Multimap.kt @@ -20,7 +20,7 @@ actual interface Multimap { actual fun isEmpty(): Boolean actual fun containsKey(key: Any?): Boolean actual fun containsValue(value: Any?): Boolean - actual operator fun get(key: K?): Collection + actual operator fun get(key: K): Collection actual fun values(): Collection actual fun asMap(): Map> } @@ -30,7 +30,7 @@ private class SimpleMultimap(private val map: Map>) : Mul override fun isEmpty() = map.isEmpty() override fun containsKey(key: Any?) = map.containsKey(key) override fun containsValue(value: Any?) = map.values.any { it.contains(value) } - override fun get(key: K?) = map[key] ?: emptyList() + override fun get(key: K) = map[key] ?: emptyList() override fun values() = map.values.flatten() override fun asMap() = map }