Merge pull request #330 from eamonnmcmanus/update-2016-05-17

Sync Google changes as of 2016-05-16.

3 files changed, 42 insertions, 2 deletions

diff --git a/common/src/main/java/com/google/auto/common/AnnotationValues.java b/common/src/main/java/com/google/auto/common/AnnotationValues.java
index 46069054..9831bcde 100644
--- a/common/src/main/java/com/google/auto/common/AnnotationValues.java
+++ b/common/src/main/java/com/google/auto/common/AnnotationValues.java
@@ -67,7 +67,7 @@ public final class AnnotationValues {
                   new SimpleAnnotationValueVisitor6<Boolean, List<? extends AnnotationValue>>() {
                     @Override protected Boolean defaultAction(
                         Object ignored, List<? extends AnnotationValue> alsoIgnored) {
-                      return false; // Not an annotation mirror, so can't be equal to such.
+                      return false; // Not an array, so can't be equal to such.
                     }
 
                     @SuppressWarnings("unchecked") // safe covariant cast
diff --git a/factory/pom.xml b/factory/pom.xml
index 446483a3..28a8d545 100644
--- a/factory/pom.xml
+++ b/factory/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.squareup</groupId>
       <artifactId>javapoet</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.0</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
diff --git a/value/CHANGES.md b/value/CHANGES.md
index 35e6a785..8f9b400c 100644
--- a/value/CHANGES.md
+++ b/value/CHANGES.md
@@ -1,5 +1,45 @@
 # AutoValue Changes
 
+## 1.2 → 1.3
+
+### Functional changes
+
+* Support for TYPE_USE `@Nullable`.
+  This is https://github.com/google/auto/pull/293 by @brychcy.
+
+* Restructured the code in AutoValueProcessor for handling extensions, to get
+  rid of warnings about abstract methods when those methods are going to be
+  implemented by an extension, and to fix a bug where extensions would not work
+  right if there was a toBuilder() method. Some of the code in this change is
+  based on https://github.com/google/auto/pull/299 by @rharter.
+
+* Added support for "optional getters", where a getter in an AutoValue Builder
+  can have type `Optional<T>` and it will return `Optional.of(x)` where `x` is
+  the value that has been set in the Builder, or `Optional.empty()` if no value
+  has been set.
+
+* In AutoValue builders, added support for setting a property of type
+  `Optional<T>` via a setter with an argument of type `T`.
+
+* Added logic to AutoValue to detect the confusing case where you think you
+  are using JavaBeans conventions (like getFoo()) but you aren't because at
+  least one method isn't.
+
+* Added a README.md describing EscapeVelocity.
+
+### Bugs fixed
+
+* Allow an `@AutoValue.Builder` to extend a parent builder using the `<B extends
+  Builder<B>>` idiom.
+
+* AutoAnnotation now factors in package names when detecting
+  overloads. Previously it treated all annotations with the same SimpleName as
+  being overload attempts.
+
+* Removed an inaccurate javadoc reference, which referred to an
+  artifact from an earlier draft version of the Extensions API. This is
+  https://github.com/google/auto/pull/322 by @lucastsa.
+
 ## 1.1 → 1.2
 
 ### Functional changes