Skip to content

Update guava monorepo to v33 #3617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oldergod merged 2 commits into from
Jun 10, 2026
+6 −6
Merged

Update guava monorepo to v33 #3617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e3aaa7
Update guava monorepo to v33
renovate[bot] Jun 2, 2026
5319957
Fix Guava
oldergod Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/Multimap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ expect interface Multimap<K, V> {
fun containsKey(key: Any?): Boolean
fun containsValue(value: Any?): Boolean

operator fun get(key: K?): Collection<V>
operator fun get(key: K): Collection<V>
fun values(): Collection<V>
fun asMap(): Map<K, Collection<V>>
}
Expand Down
4 changes: 2 additions & 2 deletions wire-schema/src/jsMain/kotlin/com/squareup/wire/schema/Multimap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ actual interface Multimap<K, V> {
actual fun isEmpty(): Boolean
actual fun containsKey(key: Any?): Boolean
actual fun containsValue(value: Any?): Boolean
actual operator fun get(key: K?): Collection<V>
actual operator fun get(key: K): Collection<V>
actual fun values(): Collection<V>
actual fun asMap(): Map<K, Collection<V>>
}
Expand All @@ -30,7 +30,7 @@ private class SimpleMultimap<K, V>(private val map: Map<K, Collection<V>>) : 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
}
Expand Down
4 changes: 2 additions & 2 deletions wire-schema/src/nativeMain/kotlin/com/squareup/wire/schema/Multimap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ actual interface Multimap<K, V> {
actual fun isEmpty(): Boolean
actual fun containsKey(key: Any?): Boolean
actual fun containsValue(value: Any?): Boolean
actual operator fun get(key: K?): Collection<V>
actual operator fun get(key: K): Collection<V>
actual fun values(): Collection<V>
actual fun asMap(): Map<K, Collection<V>>
}
Expand All @@ -30,7 +30,7 @@ private class SimpleMultimap<K, V>(private val map: Map<K, Collection<V>>) : 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
}
Expand Down
Loading