From 57f76e3a7d4d01fe083462d8d391d94a5a79542d Mon Sep 17 00:00:00 2001 From: cpovirk Date: Wed, 1 May 2024 11:42:35 -0700 Subject: [PATCH] Prepare for release 33.2.0. RELNOTES=n/a PiperOrigin-RevId: 629786924 --- README.md | 16 ++++++++-------- .../com/google/common/collect/Comparators.java | 4 ++-- .../google/common/collect/ImmutableBiMap.java | 6 +++--- .../com/google/common/collect/ImmutableList.java | 2 +- .../common/collect/ImmutableListMultimap.java | 4 ++-- .../com/google/common/collect/ImmutableMap.java | 4 ++-- .../google/common/collect/ImmutableMultiset.java | 4 ++-- .../google/common/collect/ImmutableRangeMap.java | 2 +- .../google/common/collect/ImmutableRangeSet.java | 2 +- .../com/google/common/collect/ImmutableSet.java | 2 +- .../common/collect/ImmutableSetMultimap.java | 4 ++-- .../common/collect/ImmutableSortedMap.java | 8 ++++---- .../common/collect/ImmutableSortedMultiset.java | 8 ++++---- .../common/collect/ImmutableSortedSet.java | 4 ++-- .../google/common/collect/ImmutableTable.java | 4 ++-- .../src/com/google/common/collect/Maps.java | 4 ++-- .../google/common/collect/MoreCollectors.java | 2 +- .../src/com/google/common/collect/Multimaps.java | 4 ++-- .../src/com/google/common/collect/Multisets.java | 2 +- .../src/com/google/common/collect/Sets.java | 2 +- .../src/com/google/common/collect/Tables.java | 4 ++-- .../src/com/google/common/net/HttpHeaders.java | 6 +++--- guava-testlib/README.md | 4 ++-- guava/src/com/google/common/net/HttpHeaders.java | 6 +++--- 24 files changed, 54 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 5a06fbef5bf3..76a1feebd093 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ Guava comes in two flavors: Guava's Maven group ID is `com.google.guava`, and its artifact ID is `guava`. Guava provides two different "flavors": one for use on a (Java 8+) JRE and one for use on Android or by any library that wants to be compatible with Android. -These flavors are specified in the Maven version field as either `33.1.0-jre` or -`33.1.0-android`. For more about depending on Guava, see +These flavors are specified in the Maven version field as either `33.2.0-jre` or +`33.2.0-android`. For more about depending on Guava, see [using Guava in your build]. To add a dependency on Guava using Maven, use the following: @@ -38,9 +38,9 @@ To add a dependency on Guava using Maven, use the following: com.google.guava guava - 33.1.0-jre + 33.2.0-jre - 33.1.0-android + 33.2.0-android ``` @@ -51,16 +51,16 @@ dependencies { // Pick one: // 1. Use Guava in your implementation only: - implementation("com.google.guava:guava:33.1.0-jre") + implementation("com.google.guava:guava:33.2.0-jre") // 2. Use Guava types in your public API: - api("com.google.guava:guava:33.1.0-jre") + api("com.google.guava:guava:33.2.0-jre") // 3. Android - Use Guava in your implementation only: - implementation("com.google.guava:guava:33.1.0-android") + implementation("com.google.guava:guava:33.2.0-android") // 4. Android - Use Guava types in your public API: - api("com.google.guava:guava:33.1.0-android") + api("com.google.guava:guava:33.2.0-android") } ``` diff --git a/android/guava/src/com/google/common/collect/Comparators.java b/android/guava/src/com/google/common/collect/Comparators.java index ffc2f4df7495..acab2fba41fa 100644 --- a/android/guava/src/com/google/common/collect/Comparators.java +++ b/android/guava/src/com/google/common/collect/Comparators.java @@ -128,7 +128,7 @@ private Comparators() {} * log n) time and O(n) space. * * @throws IllegalArgumentException if {@code k < 0} - * @since NEXT (available since 22.0 in guava-jre) + * @since 33.2.0 (available since 22.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -163,7 +163,7 @@ private Comparators() {} * takes O(n log n) time and O(n) space. * * @throws IllegalArgumentException if {@code k < 0} - * @since NEXT (available since 22.0 in guava-jre) + * @since 33.2.0 (available since 22.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/ImmutableBiMap.java b/android/guava/src/com/google/common/collect/ImmutableBiMap.java index 564fe2ee1e44..552e7f5cda16 100644 --- a/android/guava/src/com/google/common/collect/ImmutableBiMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableBiMap.java @@ -58,7 +58,7 @@ public abstract class ImmutableBiMap extends ImmutableMap implements * operation is performed. (This differs from the {@code Collector} returned by {@link * Collectors#toMap(Function, Function)}, which throws an {@code IllegalStateException}.) * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -626,7 +626,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException * * @throws UnsupportedOperationException always * @deprecated Use {@link ImmutableBiMap#toImmutableBiMap}. - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @Deprecated @DoNotCall("Use toImmutableBiMap") @@ -647,7 +647,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException * * @throws UnsupportedOperationException always * @deprecated - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @Deprecated @DoNotCall("Use toImmutableBiMap") diff --git a/android/guava/src/com/google/common/collect/ImmutableList.java b/android/guava/src/com/google/common/collect/ImmutableList.java index c3dc6620a584..2f760de17cb8 100644 --- a/android/guava/src/com/google/common/collect/ImmutableList.java +++ b/android/guava/src/com/google/common/collect/ImmutableList.java @@ -68,7 +68,7 @@ public abstract class ImmutableList extends ImmutableCollection * Returns a {@code Collector} that accumulates the input elements into a new {@code * ImmutableList}, in encounter order. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/ImmutableListMultimap.java b/android/guava/src/com/google/common/collect/ImmutableListMultimap.java index 4d7043699f8b..ada78684fba2 100644 --- a/android/guava/src/com/google/common/collect/ImmutableListMultimap.java +++ b/android/guava/src/com/google/common/collect/ImmutableListMultimap.java @@ -80,7 +80,7 @@ public class ImmutableListMultimap extends ImmutableMultimap * .build(); * } * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -121,7 +121,7 @@ public class ImmutableListMultimap extends ImmutableMultimap * } * } * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/ImmutableMap.java b/android/guava/src/com/google/common/collect/ImmutableMap.java index c88705b37ba7..3bc8db700e87 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableMap.java @@ -81,7 +81,7 @@ public abstract class ImmutableMap implements Map, Serializable { * from the {@code Collector} returned by {@link Collectors#toMap(Function, Function)}, which * throws an {@code IllegalStateException}.) * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -104,7 +104,7 @@ public abstract class ImmutableMap implements Map, Serializable { * *

Entries will appear in the encounter order of the first occurrence of the key. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/ImmutableMultiset.java b/android/guava/src/com/google/common/collect/ImmutableMultiset.java index 7a1057cdfd9a..493cfb70a587 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMultiset.java +++ b/android/guava/src/com/google/common/collect/ImmutableMultiset.java @@ -66,7 +66,7 @@ public abstract class ImmutableMultiset extends ImmutableMultisetGwtSerializa * ImmutableMultiset}. Elements iterate in order by the first appearance of that element in * encounter order. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -84,7 +84,7 @@ public abstract class ImmutableMultiset extends ImmutableMultisetGwtSerializa * occurrence in encounter order appears in the resulting multiset, with count equal to the sum of * the outputs of {@code countFunction.applyAsInt(t)} for each {@code t} mapped to that element. * - * @since NEXT (available since 22.0 in guava-jre) + * @since 33.2.0 (available since 22.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/ImmutableRangeMap.java b/android/guava/src/com/google/common/collect/ImmutableRangeMap.java index bc2143d6c512..75f760c7b1d3 100644 --- a/android/guava/src/com/google/common/collect/ImmutableRangeMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableRangeMap.java @@ -57,7 +57,7 @@ public class ImmutableRangeMap, V> implements RangeMap extends AbstractRange * ImmutableRangeSet}. As in {@link Builder}, overlapping ranges are not permitted and adjacent * ranges will be merged. * - * @since NEXT (available since 23.1 in guava-jre) + * @since 33.2.0 (available since 23.1 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/ImmutableSet.java b/android/guava/src/com/google/common/collect/ImmutableSet.java index 41d66311fcff..9e6c120a71e3 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSet.java +++ b/android/guava/src/com/google/common/collect/ImmutableSet.java @@ -60,7 +60,7 @@ public abstract class ImmutableSet extends ImmutableCollection implements * the stream contains duplicates (according to {@link Object#equals(Object)}), only the first * duplicate in encounter order will appear in the result. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java b/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java index 57b2db7cdd72..363285bfdce6 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java +++ b/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java @@ -88,7 +88,7 @@ public class ImmutableSetMultimap extends ImmutableMultimap * .build(); * } * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -138,7 +138,7 @@ public class ImmutableSetMultimap extends ImmutableMultimap * } * } * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java index c973eb959faf..a34d87d3f568 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java @@ -75,7 +75,7 @@ public final class ImmutableSortedMap extends ImmutableMap * from the {@code Collector} returned by {@link Collectors#toMap(Function, Function)}, which * throws an {@code IllegalStateException}.) * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -97,7 +97,7 @@ public final class ImmutableSortedMap extends ImmutableMap * using the specified merging function. Entries will appear in the encounter order of the first * occurrence of the key. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -1223,7 +1223,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException * * @throws UnsupportedOperationException always * @deprecated Use {@link ImmutableSortedMap#toImmutableSortedMap}. - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @DoNotCall("Use toImmutableSortedMap") @Deprecated @@ -1244,7 +1244,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException * * @throws UnsupportedOperationException always * @deprecated Use {@link ImmutableSortedMap#toImmutableSortedMap}. - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @DoNotCall("Use toImmutableSortedMap") @Deprecated diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java b/android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java index 8f86e6e88b6a..33430f491963 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java @@ -69,7 +69,7 @@ public abstract class ImmutableSortedMultiset extends ImmutableMultiset *

Warning: {@code comparator} should be consistent with {@code equals} as * explained in the {@link Comparator} documentation. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -88,7 +88,7 @@ public abstract class ImmutableSortedMultiset extends ImmutableMultiset * occurrence in encounter order appears in the resulting multiset, with count equal to the sum of * the outputs of {@code countFunction.applyAsInt(t)} for each {@code t} mapped to that element. * - * @since NEXT (available since 22.0 in guava-jre) + * @since 33.2.0 (available since 22.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -760,7 +760,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException * * @throws UnsupportedOperationException always * @deprecated Use {@link ImmutableSortedMultiset#toImmutableSortedMultiset}. - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @DoNotCall("Use toImmutableSortedMultiset.") @Deprecated @@ -778,7 +778,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException * * @throws UnsupportedOperationException always * @deprecated Use {@link ImmutableSortedMultiset#toImmutableSortedMultiset}. - * @since NEXT (available since 22.0 in guava-jre) + * @since 33.2.0 (available since 22.0 in guava-jre) */ @DoNotCall("Use toImmutableSortedMultiset.") @Deprecated diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedSet.java b/android/guava/src/com/google/common/collect/ImmutableSortedSet.java index f119301aa73e..0f61c768c5c2 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSortedSet.java +++ b/android/guava/src/com/google/common/collect/ImmutableSortedSet.java @@ -71,7 +71,7 @@ public abstract class ImmutableSortedSet extends ImmutableSet *

If the elements contain duplicates (according to the comparator), only the first duplicate * in encounter order will appear in the result. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -797,7 +797,7 @@ Object writeReplace() { * * @throws UnsupportedOperationException always * @deprecated Use {@link ImmutableSortedSet#toImmutableSortedSet}. - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @DoNotCall("Use toImmutableSortedSet") @Deprecated diff --git a/android/guava/src/com/google/common/collect/ImmutableTable.java b/android/guava/src/com/google/common/collect/ImmutableTable.java index 20fa98c5c832..a342ec0c46dd 100644 --- a/android/guava/src/com/google/common/collect/ImmutableTable.java +++ b/android/guava/src/com/google/common/collect/ImmutableTable.java @@ -62,7 +62,7 @@ public abstract class ImmutableTable extends AbstractTable *

The returned {@code Collector} will throw a {@code NullPointerException} at collection time * if the row, column, or value functions return null on any input. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -84,7 +84,7 @@ public abstract class ImmutableTable extends AbstractTable *

The returned {@code Collector} will throw a {@code NullPointerException} at collection time * if the row, column, value, or merging functions return null on any input. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/Maps.java b/android/guava/src/com/google/common/collect/Maps.java index 6171c476c7d0..addb3bb14976 100644 --- a/android/guava/src/com/google/common/collect/Maps.java +++ b/android/guava/src/com/google/common/collect/Maps.java @@ -191,7 +191,7 @@ public static , V> ImmutableMap immutableEnumMap( * java.util.function.Function) Collectors.toMap(Function, Function)}, which throws an {@code * IllegalStateException}.) * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -212,7 +212,7 @@ public static , V> ImmutableMap immutableEnumMap( *

If the mapped keys contain duplicates, the values are merged using the specified merging * function. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/MoreCollectors.java b/android/guava/src/com/google/common/collect/MoreCollectors.java index 8d5a41495c35..7f62735725b0 100644 --- a/android/guava/src/com/google/common/collect/MoreCollectors.java +++ b/android/guava/src/com/google/common/collect/MoreCollectors.java @@ -34,7 +34,7 @@ * with a {@code com.google.common} type. * * @author Louis Wasserman - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @GwtCompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/collect/Multimaps.java b/android/guava/src/com/google/common/collect/Multimaps.java index 51a380cfb5fe..b314f3c8994c 100644 --- a/android/guava/src/com/google/common/collect/Multimaps.java +++ b/android/guava/src/com/google/common/collect/Multimaps.java @@ -109,7 +109,7 @@ private Multimaps() {} * ImmutableSetMultimap#toImmutableSetMultimap} or {@link * ImmutableListMultimap#toImmutableListMultimap}. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -157,7 +157,7 @@ private Multimaps() {} * } * } * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/Multisets.java b/android/guava/src/com/google/common/collect/Multisets.java index 19f98628be38..f5b23f654739 100644 --- a/android/guava/src/com/google/common/collect/Multisets.java +++ b/android/guava/src/com/google/common/collect/Multisets.java @@ -79,7 +79,7 @@ private Multisets() {} *

To collect to an {@link ImmutableMultiset}, use {@link * ImmutableMultiset#toImmutableMultiset}. * - * @since NEXT (available since 22.0 in guava-jre) + * @since 33.2.0 (available since 22.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/Sets.java b/android/guava/src/com/google/common/collect/Sets.java index 22b65199370f..ef10bfa4cd3a 100644 --- a/android/guava/src/com/google/common/collect/Sets.java +++ b/android/guava/src/com/google/common/collect/Sets.java @@ -146,7 +146,7 @@ public static > ImmutableSet immutableEnumSet(Iterable e * with an implementation specialized for enums. Unlike {@link ImmutableSet#toImmutableSet}, the * resulting set will iterate over elements in their enum definition order, not encounter order. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/collect/Tables.java b/android/guava/src/com/google/common/collect/Tables.java index bd2137cfcb36..2267fc5bd415 100644 --- a/android/guava/src/com/google/common/collect/Tables.java +++ b/android/guava/src/com/google/common/collect/Tables.java @@ -64,7 +64,7 @@ private Tables() {} * *

To collect to an {@link ImmutableTable}, use {@link ImmutableTable#toImmutableTable}. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. @@ -96,7 +96,7 @@ private Tables() {} * NullPointerException} on null values returned from {@code valueFunction}, and treats nulls * returned from {@code mergeFunction} as removals of that row/column pair. * - * @since NEXT (available since 21.0 in guava-jre) + * @since 33.2.0 (available since 21.0 in guava-jre) */ @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"}) @IgnoreJRERequirement // Users will use this only if they're already using streams. diff --git a/android/guava/src/com/google/common/net/HttpHeaders.java b/android/guava/src/com/google/common/net/HttpHeaders.java index ef82d0813c8d..1524df172644 100644 --- a/android/guava/src/com/google/common/net/HttpHeaders.java +++ b/android/guava/src/com/google/common/net/HttpHeaders.java @@ -626,7 +626,7 @@ private ReferrerPolicyValues() {} * href="https://w3c.github.io/webappsec-permissions-policy/#permissions-policy-report-only-http-header-field">{@code * Permissions-Policy-Report-Only} header field name. * - * @since NEXT + * @since 33.2.0 */ public static final String PERMISSIONS_POLICY_REPORT_ONLY = "Permissions-Policy-Report-Only"; @@ -879,7 +879,7 @@ private ReferrerPolicyValues() {} * href="https://privacycg.github.io/gpc-spec/#the-sec-gpc-header-field-for-http-requests">{@code * Sec-GPC} header field name. * - * @since NEXT + * @since 33.2.0 */ public static final String SEC_GPC = "Sec-GPC"; @@ -896,7 +896,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Ad-Auction-Allowed} header field name. * - * @since NEXT + * @since 33.2.0 */ public static final String AD_AUCTION_ALLOWED = "Ad-Auction-Allowed"; diff --git a/guava-testlib/README.md b/guava-testlib/README.md index c901a4bde9af..37aa7241a739 100644 --- a/guava-testlib/README.md +++ b/guava-testlib/README.md @@ -13,7 +13,7 @@ To add a dependency on Guava testlib using Maven, use the following: com.google.guava guava-testlib - 33.1.0-jre + 33.2.0-jre test ``` @@ -22,7 +22,7 @@ To add a dependency using Gradle: ```gradle dependencies { - test 'com.google.guava:guava-testlib:33.1.0-jre' + test 'com.google.guava:guava-testlib:33.2.0-jre' } ``` diff --git a/guava/src/com/google/common/net/HttpHeaders.java b/guava/src/com/google/common/net/HttpHeaders.java index ef82d0813c8d..1524df172644 100644 --- a/guava/src/com/google/common/net/HttpHeaders.java +++ b/guava/src/com/google/common/net/HttpHeaders.java @@ -626,7 +626,7 @@ private ReferrerPolicyValues() {} * href="https://w3c.github.io/webappsec-permissions-policy/#permissions-policy-report-only-http-header-field">{@code * Permissions-Policy-Report-Only} header field name. * - * @since NEXT + * @since 33.2.0 */ public static final String PERMISSIONS_POLICY_REPORT_ONLY = "Permissions-Policy-Report-Only"; @@ -879,7 +879,7 @@ private ReferrerPolicyValues() {} * href="https://privacycg.github.io/gpc-spec/#the-sec-gpc-header-field-for-http-requests">{@code * Sec-GPC} header field name. * - * @since NEXT + * @since 33.2.0 */ public static final String SEC_GPC = "Sec-GPC"; @@ -896,7 +896,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Ad-Auction-Allowed} header field name. * - * @since NEXT + * @since 33.2.0 */ public static final String AD_AUCTION_ALLOWED = "Ad-Auction-Allowed";