From 7396bab41807702f2ce94517d0f58b8e52f603f8 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 24 Sep 2021 12:48:23 -0700 Subject: [PATCH] Prepare for release 31.0. RELNOTES=n/a PiperOrigin-RevId: 398792880 --- README.md | 14 ++++---- .../google/common/collect/ImmutableBiMap.java | 23 +++++++------ .../google/common/collect/ImmutableMap.java | 13 +++---- .../common/collect/ImmutableSortedMap.java | 11 +++--- .../google/common/collect/ImmutableTable.java | 1 + .../src/com/google/common/hash/Hashing.java | 4 +-- .../com/google/common/net/HttpHeaders.java | 34 +++++++++---------- guava-testlib/README.md | 4 +-- .../google/common/collect/ImmutableBiMap.java | 13 +++---- .../google/common/collect/ImmutableMap.java | 13 +++---- .../common/collect/ImmutableSortedMap.java | 11 +++--- .../google/common/collect/ImmutableTable.java | 1 + guava/src/com/google/common/hash/Hashing.java | 4 +-- .../com/google/common/net/HttpHeaders.java | 34 +++++++++---------- .../util/concurrent/ServiceManager.java | 2 +- 15 files changed, 95 insertions(+), 87 deletions(-) diff --git a/README.md b/README.md index 57a8e455cd7e..6898aa964af0 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ 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 Java 7 or by any library that wants to be compatible with either of those. These flavors are specified in the Maven version field as -either `30.1.1-jre` or `30.1.1-android`. For more about depending on Guava, see +either `31.0-jre` or `31.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: @@ -32,9 +32,9 @@ To add a dependency on Guava using Maven, use the following: com.google.guava guava - 30.1.1-jre + 31.0-jre - 30.1.1-android + 31.0-android ``` @@ -45,16 +45,16 @@ dependencies { // Pick one: // 1. Use Guava in your implementation only: - implementation("com.google.guava:guava:30.1.1-jre") + implementation("com.google.guava:guava:31.0-jre") // 2. Use Guava types in your public API: - api("com.google.guava:guava:30.1.1-jre") + api("com.google.guava:guava:31.0-jre") // 3. Android - Use Guava in your implementation only: - implementation("com.google.guava:guava:30.1.1-android") + implementation("com.google.guava:guava:31.0-android") // 4. Android - Use Guava types in your public API: - api("com.google.guava:guava:30.1.1-android") + api("com.google.guava:guava:31.0-android") } ``` diff --git a/android/guava/src/com/google/common/collect/ImmutableBiMap.java b/android/guava/src/com/google/common/collect/ImmutableBiMap.java index 6c6057b98954..bbae03613dc1 100644 --- a/android/guava/src/com/google/common/collect/ImmutableBiMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableBiMap.java @@ -112,8 +112,8 @@ public static ImmutableBiMap of( /** * Returns an immutable map containing the given entries, in order. * - * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @throws IllegalArgumentException if duplicate keys or values are added + * @since 31.0 */ public static ImmutableBiMap of( K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6) { @@ -129,8 +129,8 @@ public static ImmutableBiMap of( /** * Returns an immutable map containing the given entries, in order. * - * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @throws IllegalArgumentException if duplicate keys or values are added + * @since 31.0 */ public static ImmutableBiMap of( K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7) { @@ -147,8 +147,8 @@ public static ImmutableBiMap of( /** * Returns an immutable map containing the given entries, in order. * - * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @throws IllegalArgumentException if duplicate keys or values are added + * @since 31.0 */ public static ImmutableBiMap of( K k1, @@ -181,8 +181,8 @@ public static ImmutableBiMap of( /** * Returns an immutable map containing the given entries, in order. * - * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @throws IllegalArgumentException if duplicate keys or values are added + * @since 31.0 */ public static ImmutableBiMap of( K k1, @@ -218,8 +218,8 @@ public static ImmutableBiMap of( /** * Returns an immutable map containing the given entries, in order. * - * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @throws IllegalArgumentException if duplicate keys or values are added + * @since 31.0 */ public static ImmutableBiMap of( K k1, @@ -265,7 +265,7 @@ public static ImmutableBiMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys or values are provided - * @since NEXT + * @since 31.0 */ @SafeVarargs public static ImmutableBiMap ofEntries(Entry... entries) { @@ -441,6 +441,7 @@ public ImmutableBiMap build() { * entries are sorted by value. * * @throws IllegalArgumentException if duplicate keys or values were added + * @since 31.0 */ @Override public ImmutableBiMap buildOrThrow() { diff --git a/android/guava/src/com/google/common/collect/ImmutableMap.java b/android/guava/src/com/google/common/collect/ImmutableMap.java index 0fa477a6e301..fd87e0b0d23f 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableMap.java @@ -137,7 +137,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6) { @@ -154,7 +154,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7) { @@ -172,7 +172,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, @@ -206,7 +206,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, @@ -243,7 +243,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, @@ -289,7 +289,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ @SafeVarargs public static ImmutableMap ofEntries(Entry... entries) { @@ -525,6 +525,7 @@ public ImmutableMap build() { * sorted by value. * * @throws IllegalArgumentException if duplicate keys were added + * @since 31.0 */ @SuppressWarnings("unchecked") public ImmutableMap buildOrThrow() { diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java index a4942808230c..ac5f0bcefb9f 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java @@ -155,7 +155,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -174,7 +174,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -194,7 +194,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -230,7 +230,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -269,7 +269,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -704,6 +704,7 @@ public ImmutableSortedMap build() { * * @throws IllegalArgumentException if any two keys are equal according to the comparator (which * might be the keys' natural order) + * @since 31.0 */ @Override public ImmutableSortedMap buildOrThrow() { diff --git a/android/guava/src/com/google/common/collect/ImmutableTable.java b/android/guava/src/com/google/common/collect/ImmutableTable.java index 12d9659a7c55..9dcb50c85c0d 100644 --- a/android/guava/src/com/google/common/collect/ImmutableTable.java +++ b/android/guava/src/com/google/common/collect/ImmutableTable.java @@ -231,6 +231,7 @@ public ImmutableTable build() { * added. * * @throws IllegalArgumentException if duplicate key pairs were added + * @since 31.0 */ public ImmutableTable buildOrThrow() { int size = cells.size(); diff --git a/android/guava/src/com/google/common/hash/Hashing.java b/android/guava/src/com/google/common/hash/Hashing.java index e8c7445e04d4..dd6536773aa0 100644 --- a/android/guava/src/com/google/common/hash/Hashing.java +++ b/android/guava/src/com/google/common/hash/Hashing.java @@ -137,7 +137,7 @@ public static HashFunction murmur3_32() { *

This method is called {@code murmur3_32_fixed} because it fixes a bug in the {@code * HashFunction} returned by the original {@code murmur3_32} method. * - * @since NEXT + * @since 31.0 */ public static HashFunction murmur3_32_fixed(int seed) { return new Murmur3_32HashFunction(seed, /* supplementaryPlaneFix= */ true); @@ -153,7 +153,7 @@ public static HashFunction murmur3_32_fixed(int seed) { *

This method is called {@code murmur3_32_fixed} because it fixes a bug in the {@code * HashFunction} returned by the original {@code murmur3_32} method. * - * @since NEXT + * @since 31.0 */ public static HashFunction murmur3_32_fixed() { return Murmur3_32HashFunction.MURMUR3_32_FIXED; diff --git a/android/guava/src/com/google/common/net/HttpHeaders.java b/android/guava/src/com/google/common/net/HttpHeaders.java index 2363a18903c9..f318da151486 100644 --- a/android/guava/src/com/google/common/net/HttpHeaders.java +++ b/android/guava/src/com/google/common/net/HttpHeaders.java @@ -307,7 +307,7 @@ private ReferrerPolicyValues() {} /** * The HTTP {@code Keep-Alive} header field name. * - * @since NEXT + * @since 31.0 */ public static final String KEEP_ALIVE = "Keep-Alive"; /** @@ -394,7 +394,7 @@ private ReferrerPolicyValues() {} * X-Device-IP} header field name. Header used for VAST requests to provide the IP address of * the device on whose behalf the request is being made. * - * @since NEXT + * @since 31.0 */ public static final String X_DEVICE_IP = "X-Device-IP"; /** @@ -404,7 +404,7 @@ private ReferrerPolicyValues() {} * #REFERER} header value that the on-behalf-of client would have used when making a request * itself. * - * @since NEXT + * @since 31.0 */ public static final String X_DEVICE_REFERER = "X-Device-Referer"; /** @@ -414,7 +414,7 @@ private ReferrerPolicyValues() {} * {@link #ACCEPT_LANGUAGE} header value that the on-behalf-of client would have used when making * a request itself. * - * @since NEXT + * @since 31.0 */ public static final String X_DEVICE_ACCEPT_LANGUAGE = "X-Device-Accept-Language"; /** @@ -424,7 +424,7 @@ private ReferrerPolicyValues() {} * {@link #X_REQUESTED_WITH} header value that the on-behalf-of client would have used when making * a request itself. * - * @since NEXT + * @since 31.0 */ public static final String X_DEVICE_REQUESTED_WITH = "X-Device-Requested-With"; /** The HTTP {@code X-Do-Not-Track} header field name. */ @@ -537,7 +537,7 @@ private ReferrerPolicyValues() {} * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Device-Memory">{@code * Device-Memory} header field name. * - * @since NEXT + * @since 31.0 */ public static final String DEVICE_MEMORY = "Device-Memory"; @@ -545,7 +545,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Downlink} header field name. * - * @since NEXT + * @since 31.0 */ public static final String DOWNLINK = "Downlink"; @@ -553,7 +553,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * ECT} header field name. * - * @since NEXT + * @since 31.0 */ public static final String ECT = "ECT"; @@ -561,7 +561,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * RTT} header field name. * - * @since NEXT + * @since 31.0 */ public static final String RTT = "RTT"; @@ -569,7 +569,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Save-Data} header field name. * - * @since NEXT + * @since 31.0 */ public static final String SAVE_DATA = "Save-Data"; @@ -578,7 +578,7 @@ private ReferrerPolicyValues() {} * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Viewport-Width">{@code * Viewport-Width} header field name. * - * @since NEXT + * @since 31.0 */ public static final String VIEWPORT_WIDTH = "Viewport-Width"; @@ -586,7 +586,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Width} header field name. * - * @since NEXT + * @since 31.0 */ public static final String WIDTH = "Width"; @@ -594,7 +594,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code Permissions-Policy} * header field name. * - * @since NEXT + * @since 31.0 */ public static final String PERMISSIONS_POLICY = "Permissions-Policy"; @@ -605,7 +605,7 @@ private ReferrerPolicyValues() {} * *

This header is experimental. * - * @since NEXT + * @since 31.0 */ public static final String SEC_CH_PREFERS_COLOR_SCHEME = "Sec-CH-Prefers-Color-Scheme"; @@ -614,7 +614,7 @@ private ReferrerPolicyValues() {} * href="https://www.rfc-editor.org/rfc/rfc8942#name-the-accept-ch-response-head">{@code * Accept-CH} header field name. * - * @since NEXT + * @since 31.0 */ public static final String ACCEPT_CH = "Accept-CH"; /** @@ -622,7 +622,7 @@ private ReferrerPolicyValues() {} * href="https://datatracker.ietf.org/doc/html/draft-davidben-http-client-hint-reliability-03.txt#section-3">{@code * Critical-CH} header field name. * - * @since NEXT + * @since 31.0 */ public static final String CRITICAL_CH = "Critical-CH"; @@ -679,7 +679,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Sec-CH-UA-Bitness} header field name. * - * @since NEXT + * @since 31.0 */ public static final String SEC_CH_UA_BITNESS = "Sec-CH-UA-Bitness"; diff --git a/guava-testlib/README.md b/guava-testlib/README.md index 346a8805e859..934ddba39663 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 - 30.1.1-jre + 31.0-jre test ``` @@ -22,7 +22,7 @@ To add a dependency using Gradle: ```gradle dependencies { - test 'com.google.guava:guava-testlib:30.1.1-jre' + test 'com.google.guava:guava-testlib:31.0-jre' } ``` diff --git a/guava/src/com/google/common/collect/ImmutableBiMap.java b/guava/src/com/google/common/collect/ImmutableBiMap.java index 4378a623adc0..2f2e9ab5ca68 100644 --- a/guava/src/com/google/common/collect/ImmutableBiMap.java +++ b/guava/src/com/google/common/collect/ImmutableBiMap.java @@ -124,7 +124,7 @@ public static ImmutableBiMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys or values are added - * @since NEXT + * @since 31.0 */ public static ImmutableBiMap of( K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6) { @@ -141,7 +141,7 @@ public static ImmutableBiMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys or values are added - * @since NEXT + * @since 31.0 */ public static ImmutableBiMap of( K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7) { @@ -159,7 +159,7 @@ public static ImmutableBiMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys or values are added - * @since NEXT + * @since 31.0 */ public static ImmutableBiMap of( K k1, @@ -193,7 +193,7 @@ public static ImmutableBiMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys or values are added - * @since NEXT + * @since 31.0 */ public static ImmutableBiMap of( K k1, @@ -229,7 +229,7 @@ public static ImmutableBiMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys or values are added - * @since NEXT + * @since 31.0 */ public static ImmutableBiMap of( K k1, @@ -271,7 +271,7 @@ public static ImmutableBiMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys or values are provided - * @since NEXT + * @since 31.0 */ @SafeVarargs public static ImmutableBiMap ofEntries(Entry... entries) { @@ -446,6 +446,7 @@ public ImmutableBiMap build() { * entries are sorted by value. * * @throws IllegalArgumentException if duplicate keys or values were added + * @since 31.0 */ @Override public ImmutableBiMap buildOrThrow() { diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java index 75a105998c6f..23335b2809a4 100644 --- a/guava/src/com/google/common/collect/ImmutableMap.java +++ b/guava/src/com/google/common/collect/ImmutableMap.java @@ -169,7 +169,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6) { @@ -186,7 +186,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7) { @@ -204,7 +204,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, @@ -238,7 +238,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, @@ -275,7 +275,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ public static ImmutableMap of( K k1, @@ -317,7 +317,7 @@ public static ImmutableMap of( * Returns an immutable map containing the given entries, in order. * * @throws IllegalArgumentException if duplicate keys are provided - * @since NEXT + * @since 31.0 */ @SafeVarargs public static ImmutableMap ofEntries(Entry... entries) { @@ -545,6 +545,7 @@ public ImmutableMap build() { * sorted by value. * * @throws IllegalArgumentException if duplicate keys were added + * @since 31.0 */ public ImmutableMap buildOrThrow() { /* diff --git a/guava/src/com/google/common/collect/ImmutableSortedMap.java b/guava/src/com/google/common/collect/ImmutableSortedMap.java index 5d507464aaeb..c4b59c826dfb 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedMap.java +++ b/guava/src/com/google/common/collect/ImmutableSortedMap.java @@ -202,7 +202,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -221,7 +221,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -241,7 +241,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -277,7 +277,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -316,7 +316,7 @@ public static , V> ImmutableSortedMap of( * their keys. * * @throws IllegalArgumentException if any two keys are equal according to their natural ordering - * @since NEXT + * @since 31.0 */ @SuppressWarnings("unchecked") public static , V> ImmutableSortedMap of( @@ -728,6 +728,7 @@ public ImmutableSortedMap build() { * * @throws IllegalArgumentException if any two keys are equal according to the comparator (which * might be the keys' natural order) + * @since 31.0 */ @Override public ImmutableSortedMap buildOrThrow() { diff --git a/guava/src/com/google/common/collect/ImmutableTable.java b/guava/src/com/google/common/collect/ImmutableTable.java index fb3186162ef7..6d159389f630 100644 --- a/guava/src/com/google/common/collect/ImmutableTable.java +++ b/guava/src/com/google/common/collect/ImmutableTable.java @@ -275,6 +275,7 @@ public ImmutableTable build() { * added. * * @throws IllegalArgumentException if duplicate key pairs were added + * @since 31.0 */ public ImmutableTable buildOrThrow() { int size = cells.size(); diff --git a/guava/src/com/google/common/hash/Hashing.java b/guava/src/com/google/common/hash/Hashing.java index e8c7445e04d4..dd6536773aa0 100644 --- a/guava/src/com/google/common/hash/Hashing.java +++ b/guava/src/com/google/common/hash/Hashing.java @@ -137,7 +137,7 @@ public static HashFunction murmur3_32() { *

This method is called {@code murmur3_32_fixed} because it fixes a bug in the {@code * HashFunction} returned by the original {@code murmur3_32} method. * - * @since NEXT + * @since 31.0 */ public static HashFunction murmur3_32_fixed(int seed) { return new Murmur3_32HashFunction(seed, /* supplementaryPlaneFix= */ true); @@ -153,7 +153,7 @@ public static HashFunction murmur3_32_fixed(int seed) { *

This method is called {@code murmur3_32_fixed} because it fixes a bug in the {@code * HashFunction} returned by the original {@code murmur3_32} method. * - * @since NEXT + * @since 31.0 */ public static HashFunction murmur3_32_fixed() { return Murmur3_32HashFunction.MURMUR3_32_FIXED; diff --git a/guava/src/com/google/common/net/HttpHeaders.java b/guava/src/com/google/common/net/HttpHeaders.java index 2363a18903c9..f318da151486 100644 --- a/guava/src/com/google/common/net/HttpHeaders.java +++ b/guava/src/com/google/common/net/HttpHeaders.java @@ -307,7 +307,7 @@ private ReferrerPolicyValues() {} /** * The HTTP {@code Keep-Alive} header field name. * - * @since NEXT + * @since 31.0 */ public static final String KEEP_ALIVE = "Keep-Alive"; /** @@ -394,7 +394,7 @@ private ReferrerPolicyValues() {} * X-Device-IP} header field name. Header used for VAST requests to provide the IP address of * the device on whose behalf the request is being made. * - * @since NEXT + * @since 31.0 */ public static final String X_DEVICE_IP = "X-Device-IP"; /** @@ -404,7 +404,7 @@ private ReferrerPolicyValues() {} * #REFERER} header value that the on-behalf-of client would have used when making a request * itself. * - * @since NEXT + * @since 31.0 */ public static final String X_DEVICE_REFERER = "X-Device-Referer"; /** @@ -414,7 +414,7 @@ private ReferrerPolicyValues() {} * {@link #ACCEPT_LANGUAGE} header value that the on-behalf-of client would have used when making * a request itself. * - * @since NEXT + * @since 31.0 */ public static final String X_DEVICE_ACCEPT_LANGUAGE = "X-Device-Accept-Language"; /** @@ -424,7 +424,7 @@ private ReferrerPolicyValues() {} * {@link #X_REQUESTED_WITH} header value that the on-behalf-of client would have used when making * a request itself. * - * @since NEXT + * @since 31.0 */ public static final String X_DEVICE_REQUESTED_WITH = "X-Device-Requested-With"; /** The HTTP {@code X-Do-Not-Track} header field name. */ @@ -537,7 +537,7 @@ private ReferrerPolicyValues() {} * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Device-Memory">{@code * Device-Memory} header field name. * - * @since NEXT + * @since 31.0 */ public static final String DEVICE_MEMORY = "Device-Memory"; @@ -545,7 +545,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Downlink} header field name. * - * @since NEXT + * @since 31.0 */ public static final String DOWNLINK = "Downlink"; @@ -553,7 +553,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * ECT} header field name. * - * @since NEXT + * @since 31.0 */ public static final String ECT = "ECT"; @@ -561,7 +561,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * RTT} header field name. * - * @since NEXT + * @since 31.0 */ public static final String RTT = "RTT"; @@ -569,7 +569,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Save-Data} header field name. * - * @since NEXT + * @since 31.0 */ public static final String SAVE_DATA = "Save-Data"; @@ -578,7 +578,7 @@ private ReferrerPolicyValues() {} * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Viewport-Width">{@code * Viewport-Width} header field name. * - * @since NEXT + * @since 31.0 */ public static final String VIEWPORT_WIDTH = "Viewport-Width"; @@ -586,7 +586,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Width} header field name. * - * @since NEXT + * @since 31.0 */ public static final String WIDTH = "Width"; @@ -594,7 +594,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code Permissions-Policy} * header field name. * - * @since NEXT + * @since 31.0 */ public static final String PERMISSIONS_POLICY = "Permissions-Policy"; @@ -605,7 +605,7 @@ private ReferrerPolicyValues() {} * *

This header is experimental. * - * @since NEXT + * @since 31.0 */ public static final String SEC_CH_PREFERS_COLOR_SCHEME = "Sec-CH-Prefers-Color-Scheme"; @@ -614,7 +614,7 @@ private ReferrerPolicyValues() {} * href="https://www.rfc-editor.org/rfc/rfc8942#name-the-accept-ch-response-head">{@code * Accept-CH} header field name. * - * @since NEXT + * @since 31.0 */ public static final String ACCEPT_CH = "Accept-CH"; /** @@ -622,7 +622,7 @@ private ReferrerPolicyValues() {} * href="https://datatracker.ietf.org/doc/html/draft-davidben-http-client-hint-reliability-03.txt#section-3">{@code * Critical-CH} header field name. * - * @since NEXT + * @since 31.0 */ public static final String CRITICAL_CH = "Critical-CH"; @@ -679,7 +679,7 @@ private ReferrerPolicyValues() {} * The HTTP {@code * Sec-CH-UA-Bitness} header field name. * - * @since NEXT + * @since 31.0 */ public static final String SEC_CH_UA_BITNESS = "Sec-CH-UA-Bitness"; diff --git a/guava/src/com/google/common/util/concurrent/ServiceManager.java b/guava/src/com/google/common/util/concurrent/ServiceManager.java index 04d59128db44..d2dda7a1ec85 100644 --- a/guava/src/com/google/common/util/concurrent/ServiceManager.java +++ b/guava/src/com/google/common/util/concurrent/ServiceManager.java @@ -421,7 +421,7 @@ public ImmutableMap startupTimes() { * * @return Map of services and their corresponding startup time, the map entries will be ordered * by startup time. - * @since NEXT + * @since 31.0 */ @J2ObjCIncompatible public ImmutableMap startupDurations() {