From dd505172ca944879bf5d4a8b742ad9c6d9150f17 Mon Sep 17 00:00:00 2001
From: jwilson <jwilson@squareup.com>
Date: Mon, 18 Jan 2016 17:16:20 -0500
Subject: [PATCH] Update changelog for 1.1.0.

---
 CHANGELOG.md | 14 ++++++++++++++
 README.md    |  4 ++--
 pom.xml      |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea17b9a..91c613f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 Change Log
 ==========
 
+## Version 1.1.0
+
+_2016-01-19_
+
+ * New: Support [RFC 7159][rfc_7159], the latest JSON specification. This removes the constraint
+   that the root value must be an array or an object. It may now take any value: array, object,
+   string, number, boolean, or null. Previously this was only permitted if the adapter was
+   configured to be lenient.
+ * New: Enum constants may be annotated with `@Json` to customize their encoded value.
+ * New: Create new builder from Moshi instance with `Moshi.newBuilder()`.
+ * New: `Types.getRawType()` and `Types.collectionElementType()` APIs to assist in defining generic
+   type adapter factories.
+
 ## Version 1.0.0
 
 _2015-09-27_
@@ -41,3 +54,4 @@ _2015-06-16_
 
 
  [dates_example]: https://github.com/square/moshi/blob/master/examples/src/main/java/com/squareup/moshi/recipes/ReadAndWriteRfc3339Dates.java
+ [rfc_7159]: https://tools.ietf.org/html/rfc7159
diff --git a/README.md b/README.md
index 6d79f0c..fc1f2e6 100644
--- a/README.md
+++ b/README.md
@@ -368,12 +368,12 @@ Download [the latest JAR][dl] or depend via Maven:
 <dependency>
   <groupId>com.squareup.moshi</groupId>
   <artifactId>moshi</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
 </dependency>
 ```
 or Gradle:
 ```groovy
-compile 'com.squareup.moshi:moshi:1.0.0'
+compile 'com.squareup.moshi:moshi:1.1.0'
 ```
 
 Snapshots of the development version are available in [Sonatype's `snapshots` repository][snap].
diff --git a/pom.xml b/pom.xml
index eb669c4..badabe2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <java.version>1.7</java.version>
 
     <!-- Dependencies -->
-    <okio.version>1.4.0</okio.version>
+    <okio.version>1.6.0</okio.version>
 
     <!-- Test Dependencies -->
     <junit.version>4.12</junit.version>