Skip to content

Commit

Permalink
Prepare for release 28.1.
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=265978211
  • Loading branch information
cgdecker committed Aug 28, 2019
1 parent 52de2ac commit b503ce6
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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 `28.0-jre` or `28.0-android`. For more about depending on
either `28.1-jre` or `28.1-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 @@ -30,19 +30,19 @@ To add a dependency on Guava using Maven, use the following:
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.0-jre</version>
<version>28.1-jre</version>
<!-- or, for Android: -->
<version>28.0-android</version>
<version>28.1-android</version>
</dependency>
```

To add a dependency using Gradle:

```gradle
dependencies {
compile 'com.google.guava:guava:28.0-jre'
compile 'com.google.guava:guava:28.1-jre'
// or, for Android:
api 'com.google.guava:guava:28.0-android'
api 'com.google.guava:guava:28.1-android'
}
```

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 @@ -175,7 +175,7 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://w3c.github.io/webappsec-upgrade-insecure-requests/#preference">{@code
* Upgrade-Insecure-Requests}</a> header field name.
*
* @since NEXT
* @since 28.1
*/
public static final String UPGRADE_INSECURE_REQUESTS = "Upgrade-Insecure-Requests";

Expand Down
4 changes: 2 additions & 2 deletions android/guava/src/com/google/common/net/MediaType.java
Original file line number Diff line number Diff line change
Expand Up @@ -245,14 +245,14 @@ private static MediaType addKnownType(MediaType mediaType) {
/**
* <a href="https://www.iana.org/assignments/media-types/image/heif">HEIF image format</a>.
*
* @since NEXT
* @since 28.1
*/
public static final MediaType HEIF = createConstant(IMAGE_TYPE, "heif");

/**
* <a href="https://tools.ietf.org/html/rfc3745">JP2K image format</a>.
*
* @since NEXT
* @since 28.1
*/
public static final MediaType JP2K = createConstant(IMAGE_TYPE, "jp2");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public static <E> SpliteratorTester<E> of(Supplier<Spliterator<E>> spliteratorSu
ImmutableSet.of(() -> new GeneralSpliteratorOfObject<>(spliteratorSupplier.get())));
}

/** @since NEXT */
/** @since 28.1 */
@SuppressWarnings("AndroidJdkLibsChecker") // see comment on GeneralSpliteratorOfPrimitive
public static SpliteratorTester<Integer> ofInt(Supplier<Spliterator.OfInt> spliteratorSupplier) {
return new SpliteratorTester<>(
Expand All @@ -248,7 +248,7 @@ public static SpliteratorTester<Integer> ofInt(Supplier<Spliterator.OfInt> split
() -> new GeneralSpliteratorOfPrimitive<>(spliteratorSupplier.get(), c -> c::accept)));
}

/** @since NEXT */
/** @since 28.1 */
@SuppressWarnings("AndroidJdkLibsChecker") // see comment on GeneralSpliteratorOfPrimitive
public static SpliteratorTester<Long> ofLong(Supplier<Spliterator.OfLong> spliteratorSupplier) {
return new SpliteratorTester<>(
Expand All @@ -257,7 +257,7 @@ public static SpliteratorTester<Long> ofLong(Supplier<Spliterator.OfLong> splite
() -> new GeneralSpliteratorOfPrimitive<>(spliteratorSupplier.get(), c -> c::accept)));
}

/** @since NEXT */
/** @since 28.1 */
@SuppressWarnings("AndroidJdkLibsChecker") // see comment on GeneralSpliteratorOfPrimitive
public static SpliteratorTester<Double> ofDouble(
Supplier<Spliterator.OfDouble> spliteratorSupplier) {
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 @@ -175,7 +175,7 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://w3c.github.io/webappsec-upgrade-insecure-requests/#preference">{@code
* Upgrade-Insecure-Requests}</a> header field name.
*
* @since NEXT
* @since 28.1
*/
public static final String UPGRADE_INSECURE_REQUESTS = "Upgrade-Insecure-Requests";

Expand Down
4 changes: 2 additions & 2 deletions guava/src/com/google/common/net/MediaType.java
Original file line number Diff line number Diff line change
Expand Up @@ -245,14 +245,14 @@ private static MediaType addKnownType(MediaType mediaType) {
/**
* <a href="https://www.iana.org/assignments/media-types/image/heif">HEIF image format</a>.
*
* @since NEXT
* @since 28.1
*/
public static final MediaType HEIF = createConstant(IMAGE_TYPE, "heif");

/**
* <a href="https://tools.ietf.org/html/rfc3745">JP2K image format</a>.
*
* @since NEXT
* @since 28.1
*/
public static final MediaType JP2K = createConstant(IMAGE_TYPE, "jp2");

Expand Down

0 comments on commit b503ce6

Please sign in to comment.