Prepare for release 33.4.0.

RELNOTES=n/a
PiperOrigin-RevId: 706818220

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.3.1-jre` or
-`33.3.1-android`. For more about depending on Guava, see
+These flavors are specified in the Maven version field as either `33.4.0-jre` or
+`33.4.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:
 <dependency>
   <groupId>com.google.guava</groupId>
   <artifactId>guava</artifactId>
-  <version>33.3.1-jre</version>
+  <version>33.4.0-jre</version>
   <!-- or, for Android: -->
-  <version>33.3.1-android</version>
+  <version>33.4.0-android</version>
 </dependency>
 ```
 
@@ -51,16 +51,16 @@ dependencies {
   // Pick one:
 
   // 1. Use Guava in your implementation only:
-  implementation("com.google.guava:guava:33.3.1-jre")
+  implementation("com.google.guava:guava:33.4.0-jre")
 
   // 2. Use Guava types in your public API:
-  api("com.google.guava:guava:33.3.1-jre")
+  api("com.google.guava:guava:33.4.0-jre")
 
   // 3. Android - Use Guava in your implementation only:
-  implementation("com.google.guava:guava:33.3.1-android")
+  implementation("com.google.guava:guava:33.4.0-android")
 
   // 4. Android - Use Guava types in your public API:
-  api("com.google.guava:guava:33.3.1-android")
+  api("com.google.guava:guava:33.4.0-android")
 }
 ```
 

android/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java

@@ -96,7 +96,7 @@ public String getName() {
    * <p>The {@link TestCase} version (which is from JUnit 3) produces a failure message that does
    * not include the value of the object.
    *
-   * @since NEXT
+   * @since 33.4.0
    */
   public static void assertNull(String message, Object object) {
     assertEquals(message, null, object);

android/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java

@@ -47,7 +47,7 @@
 /**
  * Tester for {@code Spliterator} implementations.
  *
- * @since NEXT (but since 21.0 in the JRE flavor)
+ * @since 33.4.0 (but since 21.0 in the JRE flavor)
  */
 @GwtCompatible
 @ElementTypesAreNonnullByDefault
@@ -259,7 +259,7 @@ enum SpliteratorDecompositionStrategy {
   }
 
   /**
-   * @since NEXT (but since 28.1 in the JRE flavor)
+   * @since 33.4.0 (but since 28.1 in the JRE flavor)
    */
   public static SpliteratorTester<Integer> ofInt(Supplier<Spliterator.OfInt> spliteratorSupplier) {
     return new SpliteratorTester<>(
@@ -269,7 +269,7 @@ public static SpliteratorTester<Integer> ofInt(Supplier<Spliterator.OfInt> split
   }
 
   /**
-   * @since NEXT (but since 28.1 in the JRE flavor)
+   * @since 33.4.0 (but since 28.1 in the JRE flavor)
    */
   public static SpliteratorTester<Long> ofLong(Supplier<Spliterator.OfLong> spliteratorSupplier) {
     return new SpliteratorTester<>(
@@ -279,7 +279,7 @@ public static SpliteratorTester<Long> ofLong(Supplier<Spliterator.OfLong> splite
   }
 
   /**
-   * @since NEXT (but since 28.1 in the JRE flavor)
+   * @since 33.4.0 (but since 28.1 in the JRE flavor)
    */
   public static SpliteratorTester<Double> ofDouble(
       Supplier<Spliterator.OfDouble> spliteratorSupplier) {

android/guava/src/com/google/common/base/MoreObjects.java

@@ -179,7 +179,7 @@ public ToStringHelper omitNullValues() {
      * checked for emptiness is subject to change. We currently check {@code CharSequence}s, {@code
      * Collection}s, {@code Map}s, optionals (including Guava's), and arrays.
      *
-     * @since NEXT
+     * @since 33.4.0
      */
     @CanIgnoreReturnValue
     public ToStringHelper omitEmptyValues() {

android/guava/src/com/google/common/base/Optional.java

@@ -123,7 +123,7 @@ public static <T> Optional<T> fromNullable(@CheckForNull T nullableReference) {
    * Returns the equivalent {@code com.google.common.base.Optional} value to the given {@code
    * java.util.Optional}, or {@code null} if the argument is null.
    *
-   * @since NEXT (but since 21.0 in the JRE flavor)
+   * @since 33.4.0 (but since 21.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using Optional.
@@ -143,7 +143,7 @@ public static <T> Optional<T> fromJavaUtil(@CheckForNull java.util.Optional<T> j
    * could refer to either the static or instance version of this method. Write out the lambda
    * expression {@code o -> Optional.toJavaUtil(o)} instead.
    *
-   * @since NEXT (but since 21.0 in the JRE flavor)
+   * @since 33.4.0 (but since 21.0 in the JRE flavor)
    */
   @SuppressWarnings({
     "AmbiguousMethodReference", // We chose the name despite knowing this risk.
@@ -163,7 +163,7 @@ public static <T> java.util.Optional<T> toJavaUtil(@CheckForNull Optional<T> goo
    * could refer to either the static or instance version of this method. Write out the lambda
    * expression {@code o -> o.toJavaUtil()} instead.
    *
-   * @since NEXT (but since 21.0 in the JRE flavor)
+   * @since 33.4.0 (but since 21.0 in the JRE flavor)
    */
   @SuppressWarnings({
     "AmbiguousMethodReference", // We chose the name despite knowing this risk.

android/guava/src/com/google/common/base/Splitter.java

@@ -432,7 +432,7 @@ public List<String> splitToList(CharSequence sequence) {
    *
    * @param sequence the sequence of characters to split
    * @return a stream over the segments split from the parameter
-   * @since NEXT (but since 28.2 in the JRE flavor)
+   * @since 33.4.0 (but since 28.2 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   // If users use this when they shouldn't, we hope that NewApi will catch subsequent Stream calls.

android/guava/src/com/google/common/base/Stopwatch.java

@@ -227,7 +227,7 @@ public long elapsed(TimeUnit desiredUnit) {
    * href="https://developer.android.com/studio/write/java11-default-support-table">opt in to
    * library desugaring</a>.
    *
-   * @since NEXT (but since 22.0 in the JRE flavor)
+   * @since 33.4.0 (but since 22.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   // If users use this when they shouldn't, we hope that NewApi will catch subsequent Duration calls

android/guava/src/com/google/common/collect/Comparators.java

@@ -177,7 +177,7 @@ private Comparators() {}
    * than all other values, and orders the rest using {@code valueComparator} on the contained
    * value.
    *
-   * @since NEXT (but since 22.0 in the JRE flavor)
+   * @since 33.4.0 (but since 22.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using Optional.
@@ -192,7 +192,7 @@ public static <T> Comparator<Optional<T>> emptiesFirst(Comparator<? super T> val
    * than all other values, and orders the rest using {@code valueComparator} on the contained
    * value.
    *
-   * @since NEXT (but since 22.0 in the JRE flavor)
+   * @since 33.4.0 (but since 22.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using Optional.

android/guava/src/com/google/common/collect/Queues.java

@@ -287,7 +287,7 @@ public static <E> SynchronousQueue<E> newSynchronousQueue() {
    * @param timeout how long to wait before giving up
    * @return the number of elements transferred
    * @throws InterruptedException if interrupted while waiting
-   * @since NEXT (but since 28.0 in the JRE flavor)
+   * @since 33.4.0 (but since 28.0 in the JRE flavor)
    */
   @CanIgnoreReturnValue
   @J2ktIncompatible
@@ -359,7 +359,7 @@ public static <E> int drain(
    * @param numElements the number of elements to be waited for
    * @param timeout how long to wait before giving up
    * @return the number of elements transferred
-   * @since NEXT (but since 28.0 in the JRE flavor)
+   * @since 33.4.0 (but since 28.0 in the JRE flavor)
    */
   @CanIgnoreReturnValue
   @J2ktIncompatible

android/guava/src/com/google/common/collect/Streams.java

@@ -55,7 +55,7 @@
 /**
  * Static utility methods related to {@code Stream} instances.
  *
- * @since NEXT (but since 21.0 in the JRE flavor)
+ * @since 33.4.0 (but since 21.0 in the JRE flavor)
  */
 @GwtCompatible
 @ElementTypesAreNonnullByDefault
@@ -409,7 +409,7 @@ public boolean tryAdvance(Consumer<? super R> action) {
    * This method behaves equivalently to {@linkplain #zip zipping} the stream elements into
    * temporary pair objects and then using {@link Stream#forEach} on that stream.
    *
-   * @since NEXT (but since 22.0 in the JRE flavor)
+   * @since 33.4.0 (but since 22.0 in the JRE flavor)
    */
   @Beta
   public static <A extends @Nullable Object, B extends @Nullable Object> void forEachPair(
@@ -767,7 +767,7 @@ Splitr createSplit(Spliterator.OfDouble from, long i) {
    * <p>This interface is only intended for use by callers of {@link #mapWithIndex(Stream,
    * FunctionWithIndex)}.
    *
-   * @since NEXT (but since 21.0 in the JRE flavor)
+   * @since 33.4.0 (but since 21.0 in the JRE flavor)
    */
   public interface FunctionWithIndex<T extends @Nullable Object, R extends @Nullable Object> {
     /** Applies this function to the given argument and its index within a stream. */
@@ -828,7 +828,7 @@ public int characteristics() {
    * <p>This interface is only intended for use by callers of {@link #mapWithIndex(IntStream,
    * IntFunctionWithIndex)}.
    *
-   * @since NEXT (but since 21.0 in the JRE flavor)
+   * @since 33.4.0 (but since 21.0 in the JRE flavor)
    */
   public interface IntFunctionWithIndex<R extends @Nullable Object> {
     /** Applies this function to the given argument and its index within a stream. */
@@ -842,7 +842,7 @@ public interface IntFunctionWithIndex<R extends @Nullable Object> {
    * <p>This interface is only intended for use by callers of {@link #mapWithIndex(LongStream,
    * LongFunctionWithIndex)}.
    *
-   * @since NEXT (but since 21.0 in the JRE flavor)
+   * @since 33.4.0 (but since 21.0 in the JRE flavor)
    */
   public interface LongFunctionWithIndex<R extends @Nullable Object> {
     /** Applies this function to the given argument and its index within a stream. */
@@ -856,7 +856,7 @@ public interface LongFunctionWithIndex<R extends @Nullable Object> {
    * <p>This interface is only intended for use by callers of {@link #mapWithIndex(DoubleStream,
    * DoubleFunctionWithIndex)}.
    *
-   * @since NEXT (but since 21.0 in the JRE flavor)
+   * @since 33.4.0 (but since 21.0 in the JRE flavor)
    */
   public interface DoubleFunctionWithIndex<R extends @Nullable Object> {
     /** Applies this function to the given argument and its index within a stream. */

android/guava/src/com/google/common/collect/TreeRangeMap.java

@@ -65,7 +65,7 @@ public static <K extends Comparable, V> TreeRangeMap<K, V> create() {
   /**
    * Returns a new {@link TreeRangeMap} containing the same ranges as the given {@code RangeMap}.
    *
-   * @since NEXT
+   * @since 33.4.0
    */
   @SuppressWarnings("unchecked")
   public static <K extends Comparable<?>, V> TreeRangeMap<K, V> copyOf(

android/guava/src/com/google/common/hash/BloomFilter.java

@@ -324,7 +324,7 @@ public int hashCode() {
    * @param expectedInsertions the number of expected insertions to the constructed {@code
    *     BloomFilter}; must be positive
    * @return a {@code Collector} generating a {@code BloomFilter} of the received elements
-   * @since NEXT (but since 23.0 in the JRE flavor)
+   * @since 33.4.0 (but since 23.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
@@ -353,7 +353,7 @@ public int hashCode() {
    *     BloomFilter}; must be positive
    * @param fpp the desired false positive probability (must be positive and less than 1.0)
    * @return a {@code Collector} generating a {@code BloomFilter} of the received elements
-   * @since NEXT (but since 23.0 in the JRE flavor)
+   * @since 33.4.0 (but since 23.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.

android/guava/src/com/google/common/io/CharSink.java

@@ -128,7 +128,7 @@ public void writeLines(Iterable<? extends CharSequence> lines, String lineSepara
    * writeLines(lines, System.getProperty("line.separator"))}.
    *
    * @throws IOException if an I/O error occurs while writing to this sink
-   * @since NEXT (but since 22.0 in the JRE flavor)
+   * @since 33.4.0 (but since 22.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using Stream.
@@ -141,7 +141,7 @@ public void writeLines(Stream<? extends CharSequence> lines) throws IOException
    * the given line separator.
    *
    * @throws IOException if an I/O error occurs while writing to this sink
-   * @since NEXT (but since 22.0 in the JRE flavor)
+   * @since 33.4.0 (but since 22.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using Stream.

android/guava/src/com/google/common/io/CharSource.java

@@ -154,7 +154,7 @@ public BufferedReader openBufferedStream() throws IOException {
    * }</pre>
    *
    * @throws IOException if an I/O error occurs while opening the stream
-   * @since NEXT (but since 22.0 in the JRE flavor)
+   * @since 33.4.0 (but since 22.0 in the JRE flavor)
    */
   @MustBeClosed
   @SuppressWarnings("Java7ApiChecker")
@@ -397,7 +397,7 @@ public ImmutableList<String> readLines() throws IOException {
    *
    * @throws IOException if an I/O error occurs while reading from this source or if {@code action}
    *     throws an {@code UncheckedIOException}
-   * @since NEXT (but since 22.0 in the JRE flavor)
+   * @since 33.4.0 (but since 22.0 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   /*

android/guava/src/com/google/common/io/InsecureRecursiveDeleteException.java

@@ -32,7 +32,7 @@
  * <p>{@link RecursiveDeleteOption#ALLOW_INSECURE} can be used to force the recursive delete method
  * to proceed anyway.
  *
- * @since NEXT (but since 21.0 in the JRE flavor)
+ * @since 33.4.0 (but since 21.0 in the JRE flavor)
  * @author Colin Decker
  */
 @J2ktIncompatible

android/guava/src/com/google/common/io/MoreFiles.java

@@ -63,7 +63,7 @@
  * now available via the JDK's {@link java.nio.file.Files} class for {@code Path} - check the JDK's
  * class if a sibling method from {@code Files} appears to be missing from this class.
  *
- * @since NEXT (but since 21.0 in the JRE flavor)
+ * @since 33.4.0 (but since 21.0 in the JRE flavor)
  * @author Colin Decker
  */
 @J2ktIncompatible

android/guava/src/com/google/common/io/RecursiveDeleteOption.java

@@ -25,7 +25,7 @@
  * Options for use with recursive delete methods ({@link MoreFiles#deleteRecursively} and {@link
  * MoreFiles#deleteDirectoryContents}).
  *
- * @since NEXT (but since 21.0 in the JRE flavor)
+ * @since 33.4.0 (but since 21.0 in the JRE flavor)
  * @author Colin Decker
  */
 @J2ktIncompatible

android/guava/src/com/google/common/math/Stats.java

@@ -162,7 +162,7 @@ public static Stats of(long... values) {
    * the values using {@link #toStats()} instead.
    *
    * @param values a series of values
-   * @since NEXT (but since 28.2 in the JRE flavor)
+   * @since 33.4.0 (but since 28.2 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
@@ -180,7 +180,7 @@ public static Stats of(DoubleStream values) {
    * the values using {@link #toStats()} instead.
    *
    * @param values a series of values
-   * @since NEXT (but since 28.2 in the JRE flavor)
+   * @since 33.4.0 (but since 28.2 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
@@ -199,7 +199,7 @@ public static Stats of(IntStream values) {
    *
    * @param values a series of values, which will be converted to {@code double} values (this may
    *     cause loss of precision for longs of magnitude over 2^53 (slightly over 9e15))
-   * @since NEXT (but since 28.2 in the JRE flavor)
+   * @since 33.4.0 (but since 28.2 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
@@ -218,7 +218,7 @@ public static Stats of(LongStream values) {
    * <p>If you have any of the primitive streams {@code DoubleStream}, {@code IntStream}, or {@code
    * LongStream}, you should use the factory method {@link #of} instead.
    *
-   * @since NEXT (but since 28.2 in the JRE flavor)
+   * @since 33.4.0 (but since 28.2 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.

android/guava/src/com/google/common/math/StatsAccumulator.java

@@ -138,7 +138,7 @@ public void addAll(long... values) {
    * Adds the given values to the dataset. The stream will be completely consumed by this method.
    *
    * @param values a series of values
-   * @since NEXT (but since 28.2 in the JRE flavor)
+   * @since 33.4.0 (but since 28.2 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
@@ -150,7 +150,7 @@ public void addAll(DoubleStream values) {
    * Adds the given values to the dataset. The stream will be completely consumed by this method.
    *
    * @param values a series of values
-   * @since NEXT (but since 28.2 in the JRE flavor)
+   * @since 33.4.0 (but since 28.2 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
@@ -163,7 +163,7 @@ public void addAll(IntStream values) {
    *
    * @param values a series of values, which will be converted to {@code double} values (this may
    *     cause loss of precision for longs of magnitude over 2^53 (slightly over 9e15))
-   * @since NEXT (but since 28.2 in the JRE flavor)
+   * @since 33.4.0 (but since 28.2 in the JRE flavor)
    */
   @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.

android/guava/src/com/google/common/net/HttpHeaders.java

@@ -951,7 +951,7 @@ private ReferrerPolicyValues() {}
    * The HTTP <a href="https://datatracker.ietf.org/doc/html/rfc7838#page-8">{@code Alt-Svc}</a>
    * header field name.
    *
-   * @since NEXT
+   * @since 33.4.0
    */
   public static final String ALT_SVC = "Alt-Svc";
 }