Skip to content

Commit

Permalink
Prepare for release 33.2.0.
Browse files Browse the repository at this point in the history
RELNOTES=n/a
PiperOrigin-RevId: 629786924
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed May 1, 2024
1 parent 96fca0b commit 57f76e3
Show file tree
Hide file tree
Showing 24 changed files with 54 additions and 54 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -38,9 +38,9 @@ To add a dependency on Guava using Maven, use the following:
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.1.0-jre</version>
<version>33.2.0-jre</version>
<!-- or, for Android: -->
<version>33.1.0-android</version>
<version>33.2.0-android</version>
</dependency>
```

Expand All @@ -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")
}
```

Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/collect/Comparators.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public abstract class ImmutableBiMap<K, V> extends ImmutableMap<K, V> 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.
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public abstract class ImmutableList<E> extends ImmutableCollection<E>
* 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V>
* .build();
* }</pre>
*
* @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.
Expand Down Expand Up @@ -121,7 +121,7 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V>
* }
* }</pre>
*
* @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.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/collect/ImmutableMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public abstract class ImmutableMap<K, V> implements Map<K, V>, 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.
Expand All @@ -104,7 +104,7 @@ public abstract class ImmutableMap<K, V> implements Map<K, V>, Serializable {
*
* <p>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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public abstract class ImmutableMultiset<E> extends ImmutableMultisetGwtSerializa
* ImmutableMultiset}. Elements iterate in order by the <i>first</i> 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.
Expand All @@ -84,7 +84,7 @@ public abstract class ImmutableMultiset<E> 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class ImmutableRangeMap<K extends Comparable<?>, V> implements RangeMap<K
* Returns a {@code Collector} that accumulates the input elements into a new {@code
* ImmutableRangeMap}. As in {@link Builder}, overlapping ranges are not permitted.
*
* @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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public final class ImmutableRangeSet<C extends Comparable> 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public abstract class ImmutableSet<E> extends ImmutableCollection<E> 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class ImmutableSetMultimap<K, V> extends ImmutableMultimap<K, V>
* .build();
* }</pre>
*
* @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.
Expand Down Expand Up @@ -138,7 +138,7 @@ public class ImmutableSetMultimap<K, V> extends ImmutableMultimap<K, V>
* }
* }</pre>
*
* @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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public final class ImmutableSortedMap<K, V> extends ImmutableMap<K, V>
* 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.
Expand All @@ -97,7 +97,7 @@ public final class ImmutableSortedMap<K, V> extends ImmutableMap<K, V>
* 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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public abstract class ImmutableSortedMultiset<E> extends ImmutableMultiset<E>
* <p><b>Warning:</b> {@code comparator} should be <i>consistent with {@code equals}</i> 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.
Expand All @@ -88,7 +88,7 @@ public abstract class ImmutableSortedMultiset<E> extends ImmutableMultiset<E>
* 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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public abstract class ImmutableSortedSet<E> extends ImmutableSet<E>
* <p>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.
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public abstract class ImmutableTable<R, C, V> extends AbstractTable<R, C, V>
* <p>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.
Expand All @@ -84,7 +84,7 @@ public abstract class ImmutableTable<R, C, V> extends AbstractTable<R, C, V>
* <p>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.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/collect/Maps.java
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public static <K extends Enum<K>, V> ImmutableMap<K, V> 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.
Expand All @@ -212,7 +212,7 @@ public static <K extends Enum<K>, V> ImmutableMap<K, V> immutableEnumMap(
* <p>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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/collect/Multimaps.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -157,7 +157,7 @@ private Multimaps() {}
* }
* }</pre>
*
* @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.
Expand Down
2 changes: 1 addition & 1 deletion android/guava/src/com/google/common/collect/Multisets.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private Multisets() {}
* <p>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.
Expand Down
2 changes: 1 addition & 1 deletion android/guava/src/com/google/common/collect/Sets.java
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public static <E extends Enum<E>> ImmutableSet<E> immutableEnumSet(Iterable<E> 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.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/collect/Tables.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private Tables() {}
*
* <p>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.
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 57f76e3

Please sign in to comment.