Skip to content

Commit

Permalink
Prepare for release 30.0.
Browse files Browse the repository at this point in the history
RELNOTES=n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=337538304
  • Loading branch information
cpovirk committed Oct 16, 2020
1 parent 661384d commit cf9bab3
Show file tree
Hide file tree
Showing 18 changed files with 67 additions and 67 deletions.
14 changes: 7 additions & 7 deletions README.md
Expand Up @@ -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 `29.0-jre` or `29.0-android`. For more about depending on Guava, see
either `30.0-jre` or `30.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 @@ -32,9 +32,9 @@ To add a dependency on Guava using Maven, use the following:
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>29.0-jre</version>
<version>30.0-jre</version>
<!-- or, for Android: -->
<version>29.0-android</version>
<version>30.0-android</version>
</dependency>
```

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

Expand Down
8 changes: 4 additions & 4 deletions android/guava/src/com/google/common/collect/Comparators.java
Expand Up @@ -116,7 +116,7 @@ public static <T> boolean isInStrictOrder(
* @param a first value to compare, returned if less than or equal to b.
* @param b second value to compare.
* @throws ClassCastException if the parameters are not <i>mutually comparable</i>.
* @since NEXT
* @since 30.0
*/
@Beta
public static <T extends Comparable<? super T>> T min(T a, T b) {
Expand All @@ -136,7 +136,7 @@ public static <T extends Comparable<? super T>> T min(T a, T b) {
* @param b second value to compare.
* @throws ClassCastException if the parameters are not <i>mutually comparable</i> using the given
* comparator.
* @since NEXT
* @since 30.0
*/
@Beta
public static <T> T min(@NullableDecl T a, @NullableDecl T b, Comparator<T> comparator) {
Expand All @@ -154,7 +154,7 @@ public static <T> T min(@NullableDecl T a, @NullableDecl T b, Comparator<T> comp
* @param a first value to compare, returned if greater than or equal to b.
* @param b second value to compare.
* @throws ClassCastException if the parameters are not <i>mutually comparable</i>.
* @since NEXT
* @since 30.0
*/
@Beta
public static <T extends Comparable<? super T>> T max(T a, T b) {
Expand All @@ -174,7 +174,7 @@ public static <T extends Comparable<? super T>> T max(T a, T b) {
* @param b second value to compare.
* @throws ClassCastException if the parameters are not <i>mutually comparable</i> using the given
* comparator.
* @since NEXT
* @since 30.0
*/
@Beta
public static <T> T max(@NullableDecl T a, @NullableDecl T b, Comparator<T> comparator) {
Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/math/BigDecimalMath.java
Expand Up @@ -22,7 +22,7 @@
* A class for arithmetic on {@link BigDecimal} that is not covered by its built-in methods.
*
* @author Louis Wasserman
* @since NEXT
* @since 30.0
*/
@GwtIncompatible
public class BigDecimalMath {
Expand All @@ -47,7 +47,7 @@ private BigDecimalMath() {}
*
* @throws ArithmeticException if {@code mode} is {@link RoundingMode#UNNECESSARY} and {@code x}
* is not precisely representable as a {@code double}
* @since NEXT
* @since 30.0
*/
public static double roundToDouble(BigDecimal x, RoundingMode mode) {
return BigDecimalToDoubleRounder.INSTANCE.roundToDouble(x, mode);
Expand Down
Expand Up @@ -327,7 +327,7 @@ private static BigInteger sqrtApproxWithDoubles(BigInteger x) {
*
* @throws ArithmeticException if {@code mode} is {@link RoundingMode#UNNECESSARY} and {@code x}
* is not precisely representable as a {@code double}
* @since NEXT
* @since 30.0
*/
@GwtIncompatible
public static double roundToDouble(BigInteger x, RoundingMode mode) {
Expand Down
2 changes: 1 addition & 1 deletion android/guava/src/com/google/common/math/LongMath.java
Expand Up @@ -1239,7 +1239,7 @@ private boolean testWitness(long base, long n) {
*
* @throws ArithmeticException if {@code mode} is {@link RoundingMode#UNNECESSARY} and {@code x}
* is not precisely representable as a {@code double}
* @since NEXT
* @since 30.0
*/
@SuppressWarnings("deprecation")
@GwtIncompatible
Expand Down
18 changes: 9 additions & 9 deletions android/guava/src/com/google/common/net/HttpHeaders.java
Expand Up @@ -270,14 +270,14 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://wicg.github.io/cross-origin-embedder-policy/#COEP">{@code
* Cross-Origin-Embedder-Policy}</a> header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String CROSS_ORIGIN_EMBEDDER_POLICY = "Cross-Origin-Embedder-Policy";
/**
* The HTTP <a href="https://wicg.github.io/cross-origin-embedder-policy/#COEP-RO">{@code
* Cross-Origin-Embedder-Policy-Report-Only}</a> header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String CROSS_ORIGIN_EMBEDDER_POLICY_REPORT_ONLY =
"Cross-Origin-Embedder-Policy-Report-Only";
Expand Down Expand Up @@ -478,49 +478,49 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua">{@code Sec-CH-UA}</a>
* header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String SEC_CH_UA = "Sec-CH-UA";
/**
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-arch">{@code
* Sec-CH-UA-Arch}</a> header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String SEC_CH_UA_ARCH = "Sec-CH-UA-Arch";
/**
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-model">{@code
* Sec-CH-UA-Model}</a> header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String SEC_CH_UA_MODEL = "Sec-CH-UA-Model";
/**
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-platform">{@code
* Sec-CH-UA-Platform}</a> header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String SEC_CH_UA_PLATFORM = "Sec-CH-UA-Platform";
/**
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-platform-version">{@code
* Sec-CH-UA-Platform-Version}</a> header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String SEC_CH_UA_PLATFORM_VERSION = "Sec-CH-UA-Platform-Version";
/**
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-full-version">{@code
* Sec-CH-UA-Full-Version}</a> header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String SEC_CH_UA_FULL_VERSION = "Sec-CH-UA-Full-Version";
/**
* The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-mobile">{@code
* Sec-CH-UA-Mobile}</a> header field name.
*
* @since NEXT
* @since 30.0
*/
public static final String SEC_CH_UA_MOBILE = "Sec-CH-UA-Mobile";

Expand Down
14 changes: 7 additions & 7 deletions android/guava/src/com/google/common/net/MediaType.java
Expand Up @@ -145,7 +145,7 @@ private static MediaType addKnownType(MediaType mediaType) {
/**
* Wildcard matching any "font" top-level media type.
*
* @since NEXT
* @since 30.0
*/
public static final MediaType ANY_FONT_TYPE = createConstant(FONT_TYPE, WILDCARD);

Expand Down Expand Up @@ -709,15 +709,15 @@ private static MediaType addKnownType(MediaType mediaType) {
* A collection of font outlines as defined by <a href="https://tools.ietf.org/html/rfc8081">RFC
* 8081</a>.
*
* @since NEXT
* @since 30.0
*/
public static final MediaType FONT_COLLECTION = createConstant(FONT_TYPE, "collection");

/**
* <a href="https://en.wikipedia.org/wiki/OpenType">Open Type Font Format</a> (OTF) as defined by
* <a href="https://tools.ietf.org/html/rfc8081">RFC 8081</a>.
*
* @since NEXT
* @since 30.0
*/
public static final MediaType FONT_OTF = createConstant(FONT_TYPE, "otf");

Expand All @@ -727,15 +727,15 @@ private static MediaType addKnownType(MediaType mediaType) {
* type for SFNT, but {@link #SFNT application/font-sfnt} may be necessary in certain situations
* for compatibility.
*
* @since NEXT
* @since 30.0
*/
public static final MediaType FONT_SFNT = createConstant(FONT_TYPE, "sfnt");

/**
* <a href="https://en.wikipedia.org/wiki/TrueType">True Type Font Format</a> (TTF) as defined by
* <a href="https://tools.ietf.org/html/rfc8081">RFC 8081</a>.
*
* @since NEXT
* @since 30.0
*/
public static final MediaType FONT_TTF = createConstant(FONT_TYPE, "ttf");

Expand All @@ -745,7 +745,7 @@ private static MediaType addKnownType(MediaType mediaType) {
* type for SFNT, but {@link #WOFF application/font-woff} may be necessary in certain situations
* for compatibility.
*
* @since NEXT
* @since 30.0
*/
public static final MediaType FONT_WOFF = createConstant(FONT_TYPE, "woff");

Expand All @@ -755,7 +755,7 @@ private static MediaType addKnownType(MediaType mediaType) {
* media type for SFNT, but {@link #WOFF2 application/font-woff2} may be necessary in certain
* situations for compatibility.
*
* @since NEXT
* @since 30.0
*/
public static final MediaType FONT_WOFF2 = createConstant(FONT_TYPE, "woff2");

Expand Down
Expand Up @@ -186,7 +186,7 @@
* automatic-closing approach described above is safer.
*
* @param <V> the type of the value of this step
* @since NEXT
* @since 30.0
*/
// TODO(dpb): Consider reusing one CloseableList for the entire pipeline, modulo combinations.
@Beta // @Beta for one release.
Expand Down
Expand Up @@ -374,7 +374,7 @@ public static boolean tryAcquireUninterruptibly(
* Invokes {@code lock.}{@link Lock#tryLock(long, TimeUnit) tryLock(timeout, unit)}
* uninterruptibly.
*
* @since NEXT
* @since 30.0
*/
@GwtIncompatible // concurrency
@SuppressWarnings("GoodTime") // should accept a java.time.Duration
Expand Down Expand Up @@ -403,7 +403,7 @@ public static boolean tryLockUninterruptibly(Lock lock, long timeout, TimeUnit u
* Invokes {@code executor.}{@link ExecutorService#awaitTermination(long, TimeUnit)
* awaitTermination(long, TimeUnit)} uninterruptibly with no timeout.
*
* @since NEXT
* @since 30.0
*/
@Beta
@GwtIncompatible // concurrency
Expand All @@ -416,7 +416,7 @@ public static void awaitTerminationUninterruptibly(ExecutorService executor) {
* Invokes {@code executor.}{@link ExecutorService#awaitTermination(long, TimeUnit)
* awaitTermination(long, TimeUnit)} uninterruptibly.
*
* @since NEXT
* @since 30.0
*/
@Beta
@GwtIncompatible // concurrency
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>29.0-jre</version>
<version>30.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:29.0-jre'
test 'com.google.guava:guava-testlib:30.0-jre'
}
```

Expand Down
8 changes: 4 additions & 4 deletions guava/src/com/google/common/collect/Comparators.java
Expand Up @@ -203,7 +203,7 @@ public static <T> Comparator<Optional<T>> emptiesLast(Comparator<? super T> valu
* @param a first value to compare, returned if less than or equal to b.
* @param b second value to compare.
* @throws ClassCastException if the parameters are not <i>mutually comparable</i>.
* @since NEXT
* @since 30.0
*/
@Beta
public static <T extends Comparable<? super T>> T min(T a, T b) {
Expand All @@ -223,7 +223,7 @@ public static <T extends Comparable<? super T>> T min(T a, T b) {
* @param b second value to compare.
* @throws ClassCastException if the parameters are not <i>mutually comparable</i> using the given
* comparator.
* @since NEXT
* @since 30.0
*/
@Beta
public static <T> T min(@Nullable T a, @Nullable T b, Comparator<T> comparator) {
Expand All @@ -241,7 +241,7 @@ public static <T> T min(@Nullable T a, @Nullable T b, Comparator<T> comparator)
* @param a first value to compare, returned if greater than or equal to b.
* @param b second value to compare.
* @throws ClassCastException if the parameters are not <i>mutually comparable</i>.
* @since NEXT
* @since 30.0
*/
@Beta
public static <T extends Comparable<? super T>> T max(T a, T b) {
Expand All @@ -261,7 +261,7 @@ public static <T extends Comparable<? super T>> T max(T a, T b) {
* @param b second value to compare.
* @throws ClassCastException if the parameters are not <i>mutually comparable</i> using the given
* comparator.
* @since NEXT
* @since 30.0
*/
@Beta
public static <T> T max(@Nullable T a, @Nullable T b, Comparator<T> comparator) {
Expand Down
4 changes: 2 additions & 2 deletions guava/src/com/google/common/math/BigDecimalMath.java
Expand Up @@ -22,7 +22,7 @@
* A class for arithmetic on {@link BigDecimal} that is not covered by its built-in methods.
*
* @author Louis Wasserman
* @since NEXT
* @since 30.0
*/
@GwtIncompatible
public class BigDecimalMath {
Expand All @@ -47,7 +47,7 @@ private BigDecimalMath() {}
*
* @throws ArithmeticException if {@code mode} is {@link RoundingMode#UNNECESSARY} and {@code x}
* is not precisely representable as a {@code double}
* @since NEXT
* @since 30.0
*/
public static double roundToDouble(BigDecimal x, RoundingMode mode) {
return BigDecimalToDoubleRounder.INSTANCE.roundToDouble(x, mode);
Expand Down
2 changes: 1 addition & 1 deletion guava/src/com/google/common/math/BigIntegerMath.java
Expand Up @@ -327,7 +327,7 @@ private static BigInteger sqrtApproxWithDoubles(BigInteger x) {
*
* @throws ArithmeticException if {@code mode} is {@link RoundingMode#UNNECESSARY} and {@code x}
* is not precisely representable as a {@code double}
* @since NEXT
* @since 30.0
*/
@GwtIncompatible
public static double roundToDouble(BigInteger x, RoundingMode mode) {
Expand Down
2 changes: 1 addition & 1 deletion guava/src/com/google/common/math/LongMath.java
Expand Up @@ -1239,7 +1239,7 @@ private boolean testWitness(long base, long n) {
*
* @throws ArithmeticException if {@code mode} is {@link RoundingMode#UNNECESSARY} and {@code x}
* is not precisely representable as a {@code double}
* @since NEXT
* @since 30.0
*/
@SuppressWarnings("deprecation")
@GwtIncompatible
Expand Down

0 comments on commit cf9bab3

Please sign in to comment.