Skip to content

Commit

Permalink
Prepare for release 25.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=197733080
  • Loading branch information
cgdecker authored and cpovirk committed May 23, 2018
1 parent 57e9707 commit 824f80f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@ Guava comes in two flavors.

## Latest release

The most recent release is [Guava 25.0][current release], released 2018-04-25.
The most recent release is [Guava 25.1][current release], released 2018-05-23.

The Maven group ID is `com.google.guava`, and the artifact ID is `guava`. Use
version `25.0-jre` for the JRE flavor, or `25.0-android` for the Android flavor.
version `25.1-jre` for the JRE flavor, or `25.1-android` for the Android flavor.

To add a dependency on Guava using Maven, use the following:

```xml
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>25.0-jre</version>
<version>25.1-jre</version>
<!-- or, for Android: -->
<version>25.0-android</version>
<version>25.1-android</version>
</dependency>
```

To add a dependency using Gradle:

```
dependencies {
compile 'com.google.guava:guava:25.0-jre'
compile 'com.google.guava:guava:25.1-jre'
// or, for Android:
compile 'com.google.guava:guava:25.0-android'
compile 'com.google.guava:guava:25.1-android'
}
```

Expand Down Expand Up @@ -98,7 +98,7 @@ Linux. Some features, especially in `com.google.common.io`, may not work
correctly in other environments. For the Android flavor, our unit tests run on
API level 15 (Ice Cream Sandwich).

[current release]: https://github.com/google/guava/releases/tag/v25.0
[current release]: https://github.com/google/guava/releases/tag/v25.1
[guava-snapshot-api-docs]: https://google.github.io/guava/releases/snapshot-jre/api/docs/
[guava-snapshot-api-diffs]: https://google.github.io/guava/releases/snapshot-jre/api/diffs/
[Guava Explained]: https://github.com/google/guava/wiki/Home
Expand Down
2 changes: 1 addition & 1 deletion android/guava/src/com/google/common/base/Strings.java
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public static String commonSuffix(CharSequence a, CharSequence b) {
* specified is substituted for the first occurrence of {@code "%s"} in the template, and so
* forth. A {@code null} argument is converted to the four-character string {@code "null"};
* non-null values are converted to strings using {@link Object#toString()}.
* @since NEXT
* @since 25.1
*/
// TODO(diamondm) consider using Arrays.toString() for array parameters
// TODO(diamondm) capture exceptions thrown from arguments' toString methods
Expand Down
6 changes: 3 additions & 3 deletions android/guava/src/com/google/common/net/HttpHeaders.java
Original file line number Diff line number Diff line change
Expand Up @@ -388,21 +388,21 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://tools.ietf.org/html/draft-ietf-tokbind-https">{@code
* Sec-Token-Binding}</a> header field name.
*
* @since NEXT
* @since 25.1
*/
public static final String SEC_TOKEN_BINDING = "Sec-Token-Binding";
/**
* The HTTP <a href="https://tools.ietf.org/html/draft-ietf-tokbind-ttrp">{@code
* Sec-Provided-Token-Binding-ID}</a> header field name.
*
* @since NEXT
* @since 25.1
*/
public static final String SEC_PROVIDED_TOKEN_BINDING_ID = "Sec-Provided-Token-Binding-ID";
/**
* The HTTP <a href="https://tools.ietf.org/html/draft-ietf-tokbind-ttrp">{@code
* Sec-Referred-Token-Binding-ID}</a> header field name.
*
* @since NEXT
* @since 25.1
*/
public static final String SEC_REFERRED_TOKEN_BINDING_ID = "Sec-Referred-Token-Binding-ID";
}
2 changes: 1 addition & 1 deletion guava/src/com/google/common/base/Strings.java
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public static String commonSuffix(CharSequence a, CharSequence b) {
* specified is substituted for the first occurrence of {@code "%s"} in the template, and so
* forth. A {@code null} argument is converted to the four-character string {@code "null"};
* non-null values are converted to strings using {@link Object#toString()}.
* @since NEXT
* @since 25.1
*/
// TODO(diamondm) consider using Arrays.toString() for array parameters
// TODO(diamondm) capture exceptions thrown from arguments' toString methods
Expand Down
6 changes: 3 additions & 3 deletions guava/src/com/google/common/net/HttpHeaders.java
Original file line number Diff line number Diff line change
Expand Up @@ -388,21 +388,21 @@ private ReferrerPolicyValues() {}
* The HTTP <a href="https://tools.ietf.org/html/draft-ietf-tokbind-https">{@code
* Sec-Token-Binding}</a> header field name.
*
* @since NEXT
* @since 25.1
*/
public static final String SEC_TOKEN_BINDING = "Sec-Token-Binding";
/**
* The HTTP <a href="https://tools.ietf.org/html/draft-ietf-tokbind-ttrp">{@code
* Sec-Provided-Token-Binding-ID}</a> header field name.
*
* @since NEXT
* @since 25.1
*/
public static final String SEC_PROVIDED_TOKEN_BINDING_ID = "Sec-Provided-Token-Binding-ID";
/**
* The HTTP <a href="https://tools.ietf.org/html/draft-ietf-tokbind-ttrp">{@code
* Sec-Referred-Token-Binding-ID}</a> header field name.
*
* @since NEXT
* @since 25.1
*/
public static final String SEC_REFERRED_TOKEN_BINDING_ID = "Sec-Referred-Token-Binding-ID";
}
2 changes: 1 addition & 1 deletion guava/src/com/google/common/reflect/Parameter.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public <A extends Annotation> A[] getDeclaredAnnotationsByType(Class<A> annotati
return FluentIterable.from(annotations).filter(annotationType).toArray(annotationType);
}

/** @since NEXT */
/** @since 25.1 */
// @Override on JDK8
public AnnotatedType getAnnotatedType() {
return annotatedType;
Expand Down

0 comments on commit 824f80f

Please sign in to comment.