Skip to content

Commit

Permalink
Prepare for release 32.0.0.
Browse files Browse the repository at this point in the history
RELNOTES=n/a
PiperOrigin-RevId: 535722622
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed May 26, 2023
1 parent 23ff918 commit d5c4fd9
Show file tree
Hide file tree
Showing 28 changed files with 68 additions and 66 deletions.
16 changes: 8 additions & 8 deletions README.md
Expand Up @@ -23,8 +23,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 `31.1-jre` or
`31.1-android`. For more about depending on Guava, see
These flavors are specified in the Maven version field as either `32.0.0-jre` or
`32.0.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 @@ -33,9 +33,9 @@ To add a dependency on Guava using Maven, use the following:
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<version>32.0.0-jre</version>
<!-- or, for Android: -->
<version>31.1-android</version>
<version>32.0.0-android</version>
</dependency>
```

Expand All @@ -46,16 +46,16 @@ dependencies {
// Pick one:
// 1. Use Guava in your implementation only:
implementation("com.google.guava:guava:31.1-jre")
implementation("com.google.guava:guava:32.0.0-jre")
// 2. Use Guava types in your public API:
api("com.google.guava:guava:31.1-jre")
api("com.google.guava:guava:32.0.0-jre")
// 3. Android - Use Guava in your implementation only:
implementation("com.google.guava:guava:31.1-android")
implementation("com.google.guava:guava:32.0.0-android")
// 4. Android - Use Guava types in your public API:
api("com.google.guava:guava:31.1-android")
api("com.google.guava:guava:32.0.0-android")
}
```

Expand Down
Expand Up @@ -90,7 +90,7 @@ public static ListeningScheduledExecutorService noOpScheduledExecutor() {
* invokeAll/invokeAny} throwing RejectedExecutionException, although a subset of the tasks may
* already have been executed.
*
* @since NEXT (taking the place of a method with a different return type from 15.0)
* @since 32.0.0 (taking the place of a method with a different return type from 15.0)
*/
@Beta
public static ListeningScheduledExecutorService sameThreadScheduledExecutor() {
Expand Down
Expand Up @@ -23,7 +23,7 @@
* The presence of this annotation on an API indicates that the method may <em>not</em> be used with
* J2kt.
*
* @since NEXT
* @since 32.0.0
*/
@Retention(RetentionPolicy.CLASS)
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD})
Expand Down
1 change: 1 addition & 0 deletions android/guava/src/com/google/common/io/BaseEncoding.java
Expand Up @@ -329,6 +329,7 @@ CharSequence trimTrailingPadding(CharSequence chars) {
*
* @throws IllegalStateException if the alphabet used by this encoding contains mixed upper- and
* lower-case characters
* @since 32.0.0
*/
public abstract BaseEncoding ignoreCase();

Expand Down
18 changes: 9 additions & 9 deletions android/guava/src/com/google/common/net/HttpHeaders.java
Expand Up @@ -320,7 +320,7 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://github.com/WICG/nav-speculation/blob/main/no-vary-search.md">{@code
* No-Vary-Seearch}</a> header field name.
*
* @since NEXT
* @since 32.0.0
*/
public static final String NO_VARY_SEARCH = "No-Vary-Search";
/**
Expand Down Expand Up @@ -378,7 +378,7 @@ private ReferrerPolicyValues() {}
* href="https://developer.chrome.com/docs/privacy-sandbox/fenced-frame/#server-opt-in">fenced
* frames</a>.
*
* @since NEXT
* @since 32.0.0
*/
public static final String SUPPORTS_LOADING_MODE = "Supports-Loading-Mode";

Expand Down Expand Up @@ -710,7 +710,7 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-wow64">{@code
* Sec-CH-UA-WoW64}</a> header field name.
*
* @since NEXT
* @since 32.0.0
*/
public static final String SEC_CH_UA_WOW64 = "Sec-CH-UA-WoW64";
/**
Expand All @@ -724,30 +724,30 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factor">{@code
* Sec-CH-UA-Form-Factor}</a> header field name.
*
* @since NEXT
* @since 32.0.0
*/
public static final String SEC_CH_UA_FORM_FACTOR = "Sec-CH-UA-Form-Factor";
/**
* The HTTP <a
* href="https://wicg.github.io/responsive-image-client-hints/#sec-ch-viewport-width">{@code
* Sec-CH-Viewport-Width}</a> header field name.
*
* @since NEXT
* @since 32.0.0
*/
public static final String SEC_CH_VIEWPORT_WIDTH = "Sec-CH-Viewport-Width";
/**
* The HTTP <a
* href="https://wicg.github.io/responsive-image-client-hints/#sec-ch-viewport-height">{@code
* Sec-CH-Viewport-Height}</a> header field name.
*
* @since NEXT
* @since 32.0.0
*/
public static final String SEC_CH_VIEWPORT_HEIGHT = "Sec-CH-Viewport-Height";
/**
* The HTTP <a href="https://wicg.github.io/responsive-image-client-hints/#sec-ch-dpr">{@code
* Sec-CH-DPR}</a> header field name.
*
* @since NEXT
* @since 32.0.0
*/
public static final String SEC_CH_DPR = "Sec-CH-DPR";
/**
Expand Down Expand Up @@ -845,14 +845,14 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://patcg-individual-drafts.github.io/topics/">{@code
* Sec-Browsing-Topics}</a> header field name.
*
* @since NEXT
* @since 32.0.0
*/
public static final String SEC_BROWSING_TOPICS = "Sec-Browsing-Topics";
/**
* The HTTP <a href="https://patcg-individual-drafts.github.io/topics/">{@code
* Observe-Browsing-Topics}</a> header field name.
*
* @since NEXT
* @since 32.0.0
*/
public static final String OBSERVE_BROWSING_TOPICS = "Observe-Browsing-Topics";
/**
Expand Down
2 changes: 1 addition & 1 deletion android/guava/src/com/google/common/net/MediaType.java
Expand Up @@ -494,7 +494,7 @@ private static MediaType addKnownType(MediaType mediaType) {
/**
* For <a href="https://tools.ietf.org/html/7519">JWT objects using the compact Serialization</a>.
*
* @since NEXT
* @since 32.0.0
*/
public static final MediaType JWT = createConstant(APPLICATION_TYPE, "jwt");

Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/primitives/Booleans.java
Expand Up @@ -557,7 +557,7 @@ public static void reverse(boolean[] array, int fromIndex, int toIndex) {
*
* <p>The provided "distance" may be negative, which will rotate left.
*
* @since NEXT
* @since 32.0.0
*/
public static void rotate(boolean[] array, int distance) {
rotate(array, distance, 0, array.length);
Expand All @@ -573,7 +573,7 @@ public static void rotate(boolean[] array, int distance) {
*
* @throws IndexOutOfBoundsException if {@code fromIndex < 0}, {@code toIndex > array.length}, or
* {@code toIndex > fromIndex}
* @since NEXT
* @since 32.0.0
*/
public static void rotate(boolean[] array, int distance, int fromIndex, int toIndex) {
// See Ints.rotate for more details about possible algorithms here.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/primitives/Bytes.java
Expand Up @@ -407,7 +407,7 @@ public static void reverse(byte[] array, int fromIndex, int toIndex) {
*
* <p>The provided "distance" may be negative, which will rotate left.
*
* @since NEXT
* @since 32.0.0
*/
public static void rotate(byte[] array, int distance) {
rotate(array, distance, 0, array.length);
Expand All @@ -423,7 +423,7 @@ public static void rotate(byte[] array, int distance) {
*
* @throws IndexOutOfBoundsException if {@code fromIndex < 0}, {@code toIndex > array.length}, or
* {@code toIndex > fromIndex}
* @since NEXT
* @since 32.0.0
*/
public static void rotate(byte[] array, int distance, int fromIndex, int toIndex) {
// See Ints.rotate for more details about possible algorithms here.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/primitives/Chars.java
Expand Up @@ -494,7 +494,7 @@ public static void reverse(char[] array, int fromIndex, int toIndex) {
*
* <p>The provided "distance" may be negative, which will rotate left.
*
* @since NEXT
* @since 32.0.0
*/
public static void rotate(char[] array, int distance) {
rotate(array, distance, 0, array.length);
Expand All @@ -510,7 +510,7 @@ public static void rotate(char[] array, int distance) {
*
* @throws IndexOutOfBoundsException if {@code fromIndex < 0}, {@code toIndex > array.length}, or
* {@code toIndex > fromIndex}
* @since NEXT
* @since 32.0.0
*/
public static void rotate(char[] array, int distance, int fromIndex, int toIndex) {
// See Ints.rotate for more details about possible algorithms here.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/primitives/Doubles.java
Expand Up @@ -473,7 +473,7 @@ public static void reverse(double[] array, int fromIndex, int toIndex) {
*
* <p>The provided "distance" may be negative, which will rotate left.
*
* @since NEXT
* @since 32.0.0
*/
public static void rotate(double[] array, int distance) {
rotate(array, distance, 0, array.length);
Expand All @@ -489,7 +489,7 @@ public static void rotate(double[] array, int distance) {
*
* @throws IndexOutOfBoundsException if {@code fromIndex < 0}, {@code toIndex > array.length}, or
* {@code toIndex > fromIndex}
* @since NEXT
* @since 32.0.0
*/
public static void rotate(double[] array, int distance, int fromIndex, int toIndex) {
// See Ints.rotate for more details about possible algorithms here.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/primitives/Floats.java
Expand Up @@ -470,7 +470,7 @@ public static void reverse(float[] array, int fromIndex, int toIndex) {
*
* <p>The provided "distance" may be negative, which will rotate left.
*
* @since NEXT
* @since 32.0.0
*/
public static void rotate(float[] array, int distance) {
rotate(array, distance, 0, array.length);
Expand All @@ -486,7 +486,7 @@ public static void rotate(float[] array, int distance) {
*
* @throws IndexOutOfBoundsException if {@code fromIndex < 0}, {@code toIndex > array.length}, or
* {@code toIndex > fromIndex}
* @since NEXT
* @since 32.0.0
*/
public static void rotate(float[] array, int distance, int fromIndex, int toIndex) {
// See Ints.rotate for more details about possible algorithms here.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/primitives/Ints.java
Expand Up @@ -515,7 +515,7 @@ public static void reverse(int[] array, int fromIndex, int toIndex) {
*
* <p>The provided "distance" may be negative, which will rotate left.
*
* @since NEXT
* @since 32.0.0
*/
public static void rotate(int[] array, int distance) {
rotate(array, distance, 0, array.length);
Expand All @@ -531,7 +531,7 @@ public static void rotate(int[] array, int distance) {
*
* @throws IndexOutOfBoundsException if {@code fromIndex < 0}, {@code toIndex > array.length}, or
* {@code toIndex > fromIndex}
* @since NEXT
* @since 32.0.0
*/
public static void rotate(int[] array, int distance, int fromIndex, int toIndex) {
// There are several well-known algorithms for rotating part of an array (or, equivalently,
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/primitives/Longs.java
Expand Up @@ -609,7 +609,7 @@ public static void reverse(long[] array, int fromIndex, int toIndex) {
*
* <p>The provided "distance" may be negative, which will rotate left.
*
* @since NEXT
* @since 32.0.0
*/
public static void rotate(long[] array, int distance) {
rotate(array, distance, 0, array.length);
Expand All @@ -625,7 +625,7 @@ public static void rotate(long[] array, int distance) {
*
* @throws IndexOutOfBoundsException if {@code fromIndex < 0}, {@code toIndex > array.length}, or
* {@code toIndex > fromIndex}
* @since NEXT
* @since 32.0.0
*/
public static void rotate(long[] array, int distance, int fromIndex, int toIndex) {
// See Ints.rotate for more details about possible algorithms here.
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/primitives/Shorts.java
Expand Up @@ -517,7 +517,7 @@ public static void reverse(short[] array, int fromIndex, int toIndex) {
*
* <p>The provided "distance" may be negative, which will rotate left.
*
* @since NEXT
* @since 32.0.0
*/
public static void rotate(short[] array, int distance) {
rotate(array, distance, 0, array.length);
Expand All @@ -533,7 +533,7 @@ public static void rotate(short[] array, int distance) {
*
* @throws IndexOutOfBoundsException if {@code fromIndex < 0}, {@code toIndex > array.length}, or
* {@code toIndex > fromIndex}
* @since NEXT
* @since 32.0.0
*/
public static void rotate(short[] array, int distance, int fromIndex, int toIndex) {
// See Ints.rotate for more details about possible algorithms here.
Expand Down
4 changes: 2 additions & 2 deletions guava-testlib/README.md
Expand Up @@ -13,7 +13,7 @@ To add a dependency on Guava testlib using Maven, use the following:
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>31.1-jre</version>
<version>32.0.0-jre</version>
<scope>test</scope>
</dependency>
```
Expand All @@ -22,7 +22,7 @@ To add a dependency using Gradle:

```gradle
dependencies {
test 'com.google.guava:guava-testlib:31.1-jre'
test 'com.google.guava:guava-testlib:32.0.0-jre'
}
```

Expand Down
Expand Up @@ -90,7 +90,7 @@ public static ListeningScheduledExecutorService noOpScheduledExecutor() {
* invokeAll/invokeAny} throwing RejectedExecutionException, although a subset of the tasks may
* already have been executed.
*
* @since NEXT (taking the place of a method with a different return type from 15.0)
* @since 32.0.0 (taking the place of a method with a different return type from 15.0)
*/
@Beta
public static ListeningScheduledExecutorService sameThreadScheduledExecutor() {
Expand Down
Expand Up @@ -23,7 +23,7 @@
* The presence of this annotation on an API indicates that the method may <em>not</em> be used with
* J2kt.
*
* @since NEXT
* @since 32.0.0
*/
@Retention(RetentionPolicy.CLASS)
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD})
Expand Down
1 change: 1 addition & 0 deletions guava/src/com/google/common/io/BaseEncoding.java
Expand Up @@ -329,6 +329,7 @@ CharSequence trimTrailingPadding(CharSequence chars) {
*
* @throws IllegalStateException if the alphabet used by this encoding contains mixed upper- and
* lower-case characters
* @since 32.0.0
*/
public abstract BaseEncoding ignoreCase();

Expand Down

0 comments on commit d5c4fd9

Please sign in to comment.