Skip to content

Commit

Permalink
Prepare for release 33.3.0.
Browse files Browse the repository at this point in the history
RELNOTES=n/a
PiperOrigin-RevId: 663837851
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed Aug 16, 2024
1 parent a94ff8b commit e1eaeff
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 29 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.2.1-jre` or
`33.2.1-android`. For more about depending on Guava, see
These flavors are specified in the Maven version field as either `33.3.0-jre` or
`33.3.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.2.1-jre</version>
<version>33.3.0-jre</version>
<!-- or, for Android: -->
<version>33.2.1-android</version>
<version>33.3.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.2.1-jre")
implementation("com.google.guava:guava:33.3.0-jre")
// 2. Use Guava types in your public API:
api("com.google.guava:guava:33.2.1-jre")
api("com.google.guava:guava:33.3.0-jre")
// 3. Android - Use Guava in your implementation only:
implementation("com.google.guava:guava:33.2.1-android")
implementation("com.google.guava:guava:33.3.0-android")
// 4. Android - Use Guava types in your public API:
api("com.google.guava:guava:33.2.1-android")
api("com.google.guava:guava:33.3.0-android")
}
```

Expand Down
6 changes: 3 additions & 3 deletions android/guava/src/com/google/common/cache/CacheBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ Strength getValueStrength() {
* @throws IllegalArgumentException if {@code duration} is negative
* @throws IllegalStateException if {@link #expireAfterWrite} was already set
* @throws ArithmeticException for durations greater than +/- approximately 292 years
* @since NEXT (but since 25.0 in the JRE <a
* @since 33.3.0 (but since 25.0 in the JRE <a
* href="https://github.com/google/guava#guava-google-core-libraries-for-java">flavor</a>)
*/
@J2ObjCIncompatible
Expand Down Expand Up @@ -794,7 +794,7 @@ long getExpireAfterWriteNanos() {
* @throws IllegalArgumentException if {@code duration} is negative
* @throws IllegalStateException if {@link #expireAfterAccess} was already set
* @throws ArithmeticException for durations greater than +/- approximately 292 years
* @since NEXT (but since 25.0 in the JRE <a
* @since 33.3.0 (but since 25.0 in the JRE <a
* href="https://github.com/google/guava#guava-google-core-libraries-for-java">flavor</a>)
*/
@J2ObjCIncompatible
Expand Down Expand Up @@ -880,7 +880,7 @@ long getExpireAfterAccessNanos() {
* @throws IllegalArgumentException if {@code duration} is negative
* @throws IllegalStateException if {@link #refreshAfterWrite} was already set
* @throws ArithmeticException for durations greater than +/- approximately 292 years
* @since NEXT (but since 25.0 in the JRE <a
* @since 33.3.0 (but since 25.0 in the JRE <a
* href="https://github.com/google/guava#guava-google-core-libraries-for-java">flavor</a>)
*/
@J2ObjCIncompatible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public static <K, V> Builder<K, V> builder() {
* {@code expectedKeys} is a good estimate.
*
* @throws IllegalArgumentException if {@code expectedKeys} is negative
* @since NEXT
* @since 33.3.0
*/
public static <K, V> Builder<K, V> builderWithExpectedKeys(int expectedKeys) {
checkNonnegative(expectedKeys, "expectedKeys");
Expand Down Expand Up @@ -246,7 +246,7 @@ public Builder() {}
/**
* {@inheritDoc}
*
* @since NEXT
* @since 33.3.0
*/
@CanIgnoreReturnValue
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public static <K, V> Builder<K, V> builder() {
* {@code expectedKeys} is a good estimate.
*
* @throws IllegalArgumentException if {@code expectedKeys} is negative
* @since NEXT
* @since 33.3.0
*/
public static <K, V> Builder<K, V> builderWithExpectedKeys(int expectedKeys) {
checkNonnegative(expectedKeys, "expectedKeys");
Expand Down Expand Up @@ -203,7 +203,7 @@ ImmutableCollection.Builder<V> newValueCollectionBuilderWithExpectedSize(int exp
* {@link #expectedValuesPerKey} as its hint.
*
* @throws IllegalArgumentException if {@code expectedValuesPerKey} is negative
* @since NEXT
* @since 33.3.0
*/
@CanIgnoreReturnValue
public Builder<K, V> expectedValuesPerKey(int expectedValuesPerKey) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public static <K, V> Builder<K, V> builder() {
* {@code expectedKeys} is a good estimate.
*
* @throws IllegalArgumentException if {@code expectedKeys} is negative
* @since NEXT
* @since 33.3.0
*/
public static <K, V> Builder<K, V> builderWithExpectedKeys(int expectedKeys) {
checkNonnegative(expectedKeys, "expectedKeys");
Expand Down Expand Up @@ -295,7 +295,7 @@ int expectedValueCollectionSize(int defaultExpectedValues, Iterable<?> values) {
* <p>Note that {@code expectedValuesPerKey} is taken to mean the expected number of
* <i>distinct</i> values per key.
*
* @since NEXT
* @since 33.3.0
*/
@CanIgnoreReturnValue
@Override
Expand Down
2 changes: 1 addition & 1 deletion android/guava/src/com/google/common/net/HttpHeaders.java
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factors">{@code
* Sec-CH-UA-Form-Factors}</a> header field name.
*
* @since NEXT
* @since 33.3.0
*/
public static final String SEC_CH_UA_FORM_FACTORS = "Sec-CH-UA-Form-Factors";

Expand Down
2 changes: 1 addition & 1 deletion android/guava/src/com/google/common/net/MediaType.java
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private static MediaType addKnownType(MediaType mediaType) {
* As described in <a href="https://www.rfc-editor.org/rfc/rfc7763.html">RFC 7763</a>, this
* constant ({@code text/markdown}) is used for Markdown documents.
*
* @since NEXT
* @since 33.3.0
*/
public static final MediaType MD_UTF_8 = createConstantUtf8(TEXT_TYPE, "markdown");

Expand Down
4 changes: 2 additions & 2 deletions guava-testlib/README.md
Original file line number Diff line number Diff line change
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>33.2.1-jre</version>
<version>33.3.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:33.2.1-jre'
test 'com.google.guava:guava-testlib:33.3.0-jre'
}
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public static <K, V> Builder<K, V> builder() {
* {@code expectedKeys} is a good estimate.
*
* @throws IllegalArgumentException if {@code expectedKeys} is negative
* @since NEXT
* @since 33.3.0
*/
public static <K, V> Builder<K, V> builderWithExpectedKeys(int expectedKeys) {
checkNonnegative(expectedKeys, "expectedKeys");
Expand Down Expand Up @@ -242,7 +242,7 @@ public Builder() {}
/**
* {@inheritDoc}
*
* @since NEXT
* @since 33.3.0
*/
@CanIgnoreReturnValue
@Override
Expand Down
4 changes: 2 additions & 2 deletions guava/src/com/google/common/collect/ImmutableMultimap.java
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public static <K, V> Builder<K, V> builder() {
* {@code expectedKeys} is a good estimate.
*
* @throws IllegalArgumentException if {@code expectedKeys} is negative
* @since NEXT
* @since 33.3.0
*/
public static <K, V> Builder<K, V> builderWithExpectedKeys(int expectedKeys) {
checkNonnegative(expectedKeys, "expectedKeys");
Expand Down Expand Up @@ -205,7 +205,7 @@ ImmutableCollection.Builder<V> newValueCollectionBuilderWithExpectedSize(int exp
* {@link #expectedValuesPerKey} as its hint.
*
* @throws IllegalArgumentException if {@code expectedValuesPerKey} is negative
* @since NEXT
* @since 33.3.0
*/
@CanIgnoreReturnValue
public Builder<K, V> expectedValuesPerKey(int expectedValuesPerKey) {
Expand Down
4 changes: 2 additions & 2 deletions guava/src/com/google/common/collect/ImmutableSetMultimap.java
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public static <K, V> Builder<K, V> builder() {
* {@code expectedKeys} is a good estimate.
*
* @throws IllegalArgumentException if {@code expectedKeys} is negative
* @since NEXT
* @since 33.3.0
*/
public static <K, V> Builder<K, V> builderWithExpectedKeys(int expectedKeys) {
checkNonnegative(expectedKeys, "expectedKeys");
Expand Down Expand Up @@ -291,7 +291,7 @@ int expectedValueCollectionSize(int defaultExpectedValues, Iterable<?> values) {
* <p>Note that {@code expectedValuesPerKey} is taken to mean the expected number of
* <i>distinct</i> values per key.
*
* @since NEXT
* @since 33.3.0
*/
@CanIgnoreReturnValue
@Override
Expand Down
2 changes: 1 addition & 1 deletion guava/src/com/google/common/net/HttpHeaders.java
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factors">{@code
* Sec-CH-UA-Form-Factors}</a> header field name.
*
* @since NEXT
* @since 33.3.0
*/
public static final String SEC_CH_UA_FORM_FACTORS = "Sec-CH-UA-Form-Factors";

Expand Down
2 changes: 1 addition & 1 deletion guava/src/com/google/common/net/MediaType.java
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private static MediaType addKnownType(MediaType mediaType) {
* As described in <a href="https://www.rfc-editor.org/rfc/rfc7763.html">RFC 7763</a>, this
* constant ({@code text/markdown}) is used for Markdown documents.
*
* @since NEXT
* @since 33.3.0
*/
public static final MediaType MD_UTF_8 = createConstantUtf8(TEXT_TYPE, "markdown");

Expand Down

0 comments on commit e1eaeff

Please sign in to comment.