Skip to content

Commit 617fd28

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Prepare for release 33.4.0.
RELNOTES=n/a PiperOrigin-RevId: 706818220
1 parent 2496b4e commit 617fd28

38 files changed

+102
-102
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Guava comes in two flavors:
2828
Guava's Maven group ID is `com.google.guava`, and its artifact ID is `guava`.
2929
Guava provides two different "flavors": one for use on a (Java 8+) JRE and one
3030
for use on Android or by any library that wants to be compatible with Android.
31-
These flavors are specified in the Maven version field as either `33.3.1-jre` or
32-
`33.3.1-android`. For more about depending on Guava, see
31+
These flavors are specified in the Maven version field as either `33.4.0-jre` or
32+
`33.4.0-android`. For more about depending on Guava, see
3333
[using Guava in your build].
3434

3535
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:
3838
<dependency>
3939
<groupId>com.google.guava</groupId>
4040
<artifactId>guava</artifactId>
41-
<version>33.3.1-jre</version>
41+
<version>33.4.0-jre</version>
4242
<!-- or, for Android: -->
43-
<version>33.3.1-android</version>
43+
<version>33.4.0-android</version>
4444
</dependency>
4545
```
4646

@@ -51,16 +51,16 @@ dependencies {
5151
// Pick one:
5252
5353
// 1. Use Guava in your implementation only:
54-
implementation("com.google.guava:guava:33.3.1-jre")
54+
implementation("com.google.guava:guava:33.4.0-jre")
5555
5656
// 2. Use Guava types in your public API:
57-
api("com.google.guava:guava:33.3.1-jre")
57+
api("com.google.guava:guava:33.4.0-jre")
5858
5959
// 3. Android - Use Guava in your implementation only:
60-
implementation("com.google.guava:guava:33.3.1-android")
60+
implementation("com.google.guava:guava:33.4.0-android")
6161
6262
// 4. Android - Use Guava types in your public API:
63-
api("com.google.guava:guava:33.3.1-android")
63+
api("com.google.guava:guava:33.4.0-android")
6464
}
6565
```
6666

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public String getName() {
9696
* <p>The {@link TestCase} version (which is from JUnit 3) produces a failure message that does
9797
* not include the value of the object.
9898
*
99-
* @since NEXT
99+
* @since 33.4.0
100100
*/
101101
public static void assertNull(String message, Object object) {
102102
assertEquals(message, null, object);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
/**
4848
* Tester for {@code Spliterator} implementations.
4949
*
50-
* @since NEXT (but since 21.0 in the JRE flavor)
50+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
5151
*/
5252
@GwtCompatible
5353
@ElementTypesAreNonnullByDefault
@@ -259,7 +259,7 @@ enum SpliteratorDecompositionStrategy {
259259
}
260260

261261
/**
262-
* @since NEXT (but since 28.1 in the JRE flavor)
262+
* @since 33.4.0 (but since 28.1 in the JRE flavor)
263263
*/
264264
public static SpliteratorTester<Integer> ofInt(Supplier<Spliterator.OfInt> spliteratorSupplier) {
265265
return new SpliteratorTester<>(
@@ -269,7 +269,7 @@ public static SpliteratorTester<Integer> ofInt(Supplier<Spliterator.OfInt> split
269269
}
270270

271271
/**
272-
* @since NEXT (but since 28.1 in the JRE flavor)
272+
* @since 33.4.0 (but since 28.1 in the JRE flavor)
273273
*/
274274
public static SpliteratorTester<Long> ofLong(Supplier<Spliterator.OfLong> spliteratorSupplier) {
275275
return new SpliteratorTester<>(
@@ -279,7 +279,7 @@ public static SpliteratorTester<Long> ofLong(Supplier<Spliterator.OfLong> splite
279279
}
280280

281281
/**
282-
* @since NEXT (but since 28.1 in the JRE flavor)
282+
* @since 33.4.0 (but since 28.1 in the JRE flavor)
283283
*/
284284
public static SpliteratorTester<Double> ofDouble(
285285
Supplier<Spliterator.OfDouble> spliteratorSupplier) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public ToStringHelper omitNullValues() {
179179
* checked for emptiness is subject to change. We currently check {@code CharSequence}s, {@code
180180
* Collection}s, {@code Map}s, optionals (including Guava's), and arrays.
181181
*
182-
* @since NEXT
182+
* @since 33.4.0
183183
*/
184184
@CanIgnoreReturnValue
185185
public ToStringHelper omitEmptyValues() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public static <T> Optional<T> fromNullable(@CheckForNull T nullableReference) {
123123
* Returns the equivalent {@code com.google.common.base.Optional} value to the given {@code
124124
* java.util.Optional}, or {@code null} if the argument is null.
125125
*
126-
* @since NEXT (but since 21.0 in the JRE flavor)
126+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
127127
*/
128128
@SuppressWarnings("Java7ApiChecker")
129129
@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
143143
* could refer to either the static or instance version of this method. Write out the lambda
144144
* expression {@code o -> Optional.toJavaUtil(o)} instead.
145145
*
146-
* @since NEXT (but since 21.0 in the JRE flavor)
146+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
147147
*/
148148
@SuppressWarnings({
149149
"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
163163
* could refer to either the static or instance version of this method. Write out the lambda
164164
* expression {@code o -> o.toJavaUtil()} instead.
165165
*
166-
* @since NEXT (but since 21.0 in the JRE flavor)
166+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
167167
*/
168168
@SuppressWarnings({
169169
"AmbiguousMethodReference", // We chose the name despite knowing this risk.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ public List<String> splitToList(CharSequence sequence) {
432432
*
433433
* @param sequence the sequence of characters to split
434434
* @return a stream over the segments split from the parameter
435-
* @since NEXT (but since 28.2 in the JRE flavor)
435+
* @since 33.4.0 (but since 28.2 in the JRE flavor)
436436
*/
437437
@SuppressWarnings("Java7ApiChecker")
438438
// 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public long elapsed(TimeUnit desiredUnit) {
227227
* href="https://developer.android.com/studio/write/java11-default-support-table">opt in to
228228
* library desugaring</a>.
229229
*
230-
* @since NEXT (but since 22.0 in the JRE flavor)
230+
* @since 33.4.0 (but since 22.0 in the JRE flavor)
231231
*/
232232
@SuppressWarnings("Java7ApiChecker")
233233
// 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private Comparators() {}
177177
* than all other values, and orders the rest using {@code valueComparator} on the contained
178178
* value.
179179
*
180-
* @since NEXT (but since 22.0 in the JRE flavor)
180+
* @since 33.4.0 (but since 22.0 in the JRE flavor)
181181
*/
182182
@SuppressWarnings("Java7ApiChecker")
183183
@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
192192
* than all other values, and orders the rest using {@code valueComparator} on the contained
193193
* value.
194194
*
195-
* @since NEXT (but since 22.0 in the JRE flavor)
195+
* @since 33.4.0 (but since 22.0 in the JRE flavor)
196196
*/
197197
@SuppressWarnings("Java7ApiChecker")
198198
@IgnoreJRERequirement // Users will use this only if they're already using Optional.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public static <E> SynchronousQueue<E> newSynchronousQueue() {
287287
* @param timeout how long to wait before giving up
288288
* @return the number of elements transferred
289289
* @throws InterruptedException if interrupted while waiting
290-
* @since NEXT (but since 28.0 in the JRE flavor)
290+
* @since 33.4.0 (but since 28.0 in the JRE flavor)
291291
*/
292292
@CanIgnoreReturnValue
293293
@J2ktIncompatible
@@ -359,7 +359,7 @@ public static <E> int drain(
359359
* @param numElements the number of elements to be waited for
360360
* @param timeout how long to wait before giving up
361361
* @return the number of elements transferred
362-
* @since NEXT (but since 28.0 in the JRE flavor)
362+
* @since 33.4.0 (but since 28.0 in the JRE flavor)
363363
*/
364364
@CanIgnoreReturnValue
365365
@J2ktIncompatible

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
/**
5656
* Static utility methods related to {@code Stream} instances.
5757
*
58-
* @since NEXT (but since 21.0 in the JRE flavor)
58+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
5959
*/
6060
@GwtCompatible
6161
@ElementTypesAreNonnullByDefault
@@ -409,7 +409,7 @@ public boolean tryAdvance(Consumer<? super R> action) {
409409
* This method behaves equivalently to {@linkplain #zip zipping} the stream elements into
410410
* temporary pair objects and then using {@link Stream#forEach} on that stream.
411411
*
412-
* @since NEXT (but since 22.0 in the JRE flavor)
412+
* @since 33.4.0 (but since 22.0 in the JRE flavor)
413413
*/
414414
@Beta
415415
public static <A extends @Nullable Object, B extends @Nullable Object> void forEachPair(
@@ -767,7 +767,7 @@ Splitr createSplit(Spliterator.OfDouble from, long i) {
767767
* <p>This interface is only intended for use by callers of {@link #mapWithIndex(Stream,
768768
* FunctionWithIndex)}.
769769
*
770-
* @since NEXT (but since 21.0 in the JRE flavor)
770+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
771771
*/
772772
public interface FunctionWithIndex<T extends @Nullable Object, R extends @Nullable Object> {
773773
/** Applies this function to the given argument and its index within a stream. */
@@ -828,7 +828,7 @@ public int characteristics() {
828828
* <p>This interface is only intended for use by callers of {@link #mapWithIndex(IntStream,
829829
* IntFunctionWithIndex)}.
830830
*
831-
* @since NEXT (but since 21.0 in the JRE flavor)
831+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
832832
*/
833833
public interface IntFunctionWithIndex<R extends @Nullable Object> {
834834
/** Applies this function to the given argument and its index within a stream. */
@@ -842,7 +842,7 @@ public interface IntFunctionWithIndex<R extends @Nullable Object> {
842842
* <p>This interface is only intended for use by callers of {@link #mapWithIndex(LongStream,
843843
* LongFunctionWithIndex)}.
844844
*
845-
* @since NEXT (but since 21.0 in the JRE flavor)
845+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
846846
*/
847847
public interface LongFunctionWithIndex<R extends @Nullable Object> {
848848
/** Applies this function to the given argument and its index within a stream. */
@@ -856,7 +856,7 @@ public interface LongFunctionWithIndex<R extends @Nullable Object> {
856856
* <p>This interface is only intended for use by callers of {@link #mapWithIndex(DoubleStream,
857857
* DoubleFunctionWithIndex)}.
858858
*
859-
* @since NEXT (but since 21.0 in the JRE flavor)
859+
* @since 33.4.0 (but since 21.0 in the JRE flavor)
860860
*/
861861
public interface DoubleFunctionWithIndex<R extends @Nullable Object> {
862862
/** Applies this function to the given argument and its index within a stream. */

0 commit comments

Comments
 (0)