From bbcafaf1ad400c6417b2be91f6e12b72a73754e4 Mon Sep 17 00:00:00 2001
From: Oleg Ilyenko <oleg.ilyenko@gmail.com>
Date: Wed, 1 Mar 2017 22:16:35 +0100
Subject: [PATCH] Release v1.0.1

---
 .travis.yml  | 1 +
 CHANGELOG.md | 5 +++++
 README.md    | 3 ++-
 build.sbt    | 8 ++++----
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2fa4291..965f2b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: scala
 scala:
+  - 2.12.1
   - 2.11.8
 jdk:
   - oraclejdk8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cff83f..eb18895 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.0.1 (2017-03-01)
+
+* Updated play-json to v2.6.0-M3
+* Cross-compile for scala 2.11 and 2.12
+
 ## v1.0.0 (2017-01-16)
 
 * 1.0 Release
diff --git a/README.md b/README.md
index 6013a14..73c6b87 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 SBT Configuration:
 
 ```scala
-libraryDependencies += "org.sangria-graphql" %% "sangria-play-json" % "1.0.0"
+libraryDependencies += "org.sangria-graphql" %% "sangria-play-json" % "1.0.1"
 ```
 
 ## Compatibility matrix
@@ -20,6 +20,7 @@ libraryDependencies += "org.sangria-graphql" %% "sangria-play-json" % "1.0.0"
 |0.3.2             | 2.5.3    | 0.2.1                 |
 |0.3.3             | 2.5.9    | 0.2.1                 |
 |1.0.0             | 2.5.10   | 1.0.0                 |
+|1.0.1             | 2.6.0-M3 | 1.0.0                 |
 
 
 ## License
diff --git a/build.sbt b/build.sbt
index 5a01923..de786f4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,19 +1,19 @@
 name := "sangria-play-json"
 organization := "org.sangria-graphql"
-version := "1.0.1-SNAPSHOT"
+version := "1.0.1"
 
 description := "Sangria play-json marshalling"
 homepage := Some(url("http://sangria-graphql.org"))
 licenses := Seq("Apache License, ASL Version 2.0" → url("http://www.apache.org/licenses/LICENSE-2.0"))
 
-scalaVersion := "2.11.8"
-crossScalaVersions := Seq("2.11.8")
+scalaVersion := "2.12.1"
+crossScalaVersions := Seq("2.11.8", "2.12.1")
 
 scalacOptions ++= Seq("-deprecation", "-feature")
 
 libraryDependencies ++= Seq(
   "org.sangria-graphql" %% "sangria-marshalling-api" % "1.0.0",
-  "com.typesafe.play" %% "play-json" % "2.5.10",
+  "com.typesafe.play" %% "play-json" % "2.6.0-M3",
 
   "org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.0" % "test",
   "org.scalatest" %% "scalatest" % "3.0.1" % "test"