From 9704538cd9aa8e4b783b824773cfc76290f572c2 Mon Sep 17 00:00:00 2001 From: cgdecker Date: Wed, 17 Oct 2018 14:24:51 -0700 Subject: [PATCH] Prepare for release 27.0. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=217587480 --- README.md | 10 +++++----- android/guava/src/com/google/common/collect/Range.java | 2 +- .../guava/src/com/google/common/net/HttpHeaders.java | 2 +- android/guava/src/com/google/common/net/MediaType.java | 2 +- .../google/common/util/concurrent/AbstractService.java | 2 +- guava/src/com/google/common/collect/Range.java | 2 +- guava/src/com/google/common/net/HttpHeaders.java | 2 +- guava/src/com/google/common/net/MediaType.java | 2 +- .../google/common/util/concurrent/AbstractService.java | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index dfd9eb5188d4..f7a94e5f490b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,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 `26.0-jre` or `26.0-android`. For more about depending on +either `27.0-jre` or `27.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: @@ -31,9 +31,9 @@ To add a dependency on Guava using Maven, use the following: com.google.guava guava - 26.0-jre + 27.0-jre - 26.0-android + 27.0-android ``` @@ -41,9 +41,9 @@ To add a dependency using Gradle: ```gradle dependencies { - compile 'com.google.guava:guava:26.0-jre' + compile 'com.google.guava:guava:27.0-jre' // or, for Android: - api 'com.google.guava:guava:26.0-android' + api 'com.google.guava:guava:27.0-android' } ``` diff --git a/android/guava/src/com/google/common/collect/Range.java b/android/guava/src/com/google/common/collect/Range.java index f6f5e07e4155..abddeb1f5d0b 100644 --- a/android/guava/src/com/google/common/collect/Range.java +++ b/android/guava/src/com/google/common/collect/Range.java @@ -568,7 +568,7 @@ public Range intersection(Range connectedRange) { * * @throws IllegalArgumentException if this range and {@code otherRange} have a nonempty * intersection - * @since NEXT + * @since 27.0 */ public Range gap(Range otherRange) { boolean isThisFirst = this.lowerBound.compareTo(otherRange.lowerBound) < 0; diff --git a/android/guava/src/com/google/common/net/HttpHeaders.java b/android/guava/src/com/google/common/net/HttpHeaders.java index 255615f4bae5..4c103d83f72b 100644 --- a/android/guava/src/com/google/common/net/HttpHeaders.java +++ b/android/guava/src/com/google/common/net/HttpHeaders.java @@ -77,7 +77,7 @@ private HttpHeaders() {} * The HTTP {@code Early-Data} header field * name. * - * @since NEXT + * @since 27.0 */ public static final String EARLY_DATA = "Early-Data"; /** The HTTP {@code Expect} header field name. */ diff --git a/android/guava/src/com/google/common/net/MediaType.java b/android/guava/src/com/google/common/net/MediaType.java index 0944ec27e24e..d717d3cd9ec3 100644 --- a/android/guava/src/com/google/common/net/MediaType.java +++ b/android/guava/src/com/google/common/net/MediaType.java @@ -472,7 +472,7 @@ private static MediaType addKnownType(MediaType mediaType) { * Media type for WASM applications. For more information see the Web Assembly overview. * - * @since NEXT + * @since 27.0 */ public static final MediaType WASM_APPLICATION = createConstant(APPLICATION_TYPE, "wasm"); /** diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractService.java b/android/guava/src/com/google/common/util/concurrent/AbstractService.java index ca62e16e27f3..bc5bf9b1f73b 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractService.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractService.java @@ -233,7 +233,7 @@ protected AbstractService() {} *

When this method is called {@link #state()} will return {@link State#STOPPING}, which * is the external state observable by the caller of {@link #stopAsync}. * - * @since NEXT + * @since 27.0 */ @ForOverride protected void doCancelStart() {} diff --git a/guava/src/com/google/common/collect/Range.java b/guava/src/com/google/common/collect/Range.java index ae5df4c4fd14..d7b83b8a4a77 100644 --- a/guava/src/com/google/common/collect/Range.java +++ b/guava/src/com/google/common/collect/Range.java @@ -568,7 +568,7 @@ public Range intersection(Range connectedRange) { * * @throws IllegalArgumentException if this range and {@code otherRange} have a nonempty * intersection - * @since NEXT + * @since 27.0 */ public Range gap(Range otherRange) { boolean isThisFirst = this.lowerBound.compareTo(otherRange.lowerBound) < 0; diff --git a/guava/src/com/google/common/net/HttpHeaders.java b/guava/src/com/google/common/net/HttpHeaders.java index 255615f4bae5..4c103d83f72b 100644 --- a/guava/src/com/google/common/net/HttpHeaders.java +++ b/guava/src/com/google/common/net/HttpHeaders.java @@ -77,7 +77,7 @@ private HttpHeaders() {} * The HTTP {@code Early-Data} header field * name. * - * @since NEXT + * @since 27.0 */ public static final String EARLY_DATA = "Early-Data"; /** The HTTP {@code Expect} header field name. */ diff --git a/guava/src/com/google/common/net/MediaType.java b/guava/src/com/google/common/net/MediaType.java index e6895208c95f..aaf3af640cef 100644 --- a/guava/src/com/google/common/net/MediaType.java +++ b/guava/src/com/google/common/net/MediaType.java @@ -472,7 +472,7 @@ private static MediaType addKnownType(MediaType mediaType) { * Media type for WASM applications. For more information see the Web Assembly overview. * - * @since NEXT + * @since 27.0 */ public static final MediaType WASM_APPLICATION = createConstant(APPLICATION_TYPE, "wasm"); /** diff --git a/guava/src/com/google/common/util/concurrent/AbstractService.java b/guava/src/com/google/common/util/concurrent/AbstractService.java index a2b597256825..dcfcb271c03a 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractService.java +++ b/guava/src/com/google/common/util/concurrent/AbstractService.java @@ -233,7 +233,7 @@ protected AbstractService() {} *

When this method is called {@link #state()} will return {@link State#STOPPING}, which * is the external state observable by the caller of {@link #stopAsync}. * - * @since NEXT + * @since 27.0 */ @ForOverride protected void doCancelStart() {}