From 4189bcc5601c391b3f9ee0e3f110e68735c63dcd Mon Sep 17 00:00:00 2001
From: cardamo <sinicyn.artem@gmail.co>
Date: Tue, 18 Jul 2017 21:02:53 +0300
Subject: [PATCH] Play 2.6 and scala 2.12 support

---
 README.md | 42 +++++++++++++++---------------------------
 build.sbt |  7 ++++---
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index cd89229..3ed59aa 100644
--- a/README.md
+++ b/README.md
@@ -12,34 +12,17 @@ I'm going to publish them at jcenter but it may require changing groupId.
 
 ## Installation
 
-Add the following dependency for Play > 2.5.14:
+Add the following dependency for Play 2.6.x:
 
-    libraryDependencies += "org.databrary" %% "play-logback-access" % "0.5.2"
-
-Add the following dependency for Play 2.5.0 - 2.5.13:
-
-    libraryDependencies += "org.databrary" %% "play-logback-access" % "0.5.1"
-
-### Play 2.4.x
-
-Add the following dependency for Play 2.4.x:
-
-    libraryDependencies += "org.databrary" %% "play-logback-access" % "0.4"
-
-### Play 2.3.x
-
-For Play 2.3.x on Scala 2.11, use version 0.3:
-
-    libraryDependencies += "org.databrary" %% "play-logback-access" % "0.3"
-
-[Usage info](https://github.com/databrary/play-logback-access/releases/tag/0.3)
-
-### Play 2.2.x
-
-For Play 2.2.x on Scala 2.10, use version 0.1:
-
-    libraryDependencies += "org.databrary" %% "play-logback-access" % "0.1"
+    libraryDependencies += "org.databrary" %% "play-logback-access" % "0.6.0"
 
+| play version | lib version |
+|--------------|-------------|
+| 2.5.14+      | 0.5.2       |
+| 2.5.0+       | 0.5.1       |
+| 2.4.x        | 0.4         |
+| 2.3.x        | 0.3         |
+| 2.2.x        | 0.1         |
 
 ## Configuration
 
@@ -79,7 +62,12 @@ Inject `PlayLogbackAccessFilter` to access a Filter (in 0.4 and earlier this was
 
 ### Example: Filter
 
-#### 0.5 and later:
+#### 0.6:
+In file `conf/application.conf`
+
+    play.filters.enabled += org.databrary.PlayLogbackAccessFilter
+
+#### 0.5:
 
 In file: `app/Filters.scala`
 ```scala
diff --git a/build.sbt b/build.sbt
index bf90c09..50e27b6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -12,10 +12,10 @@ homepage := Some(url("http://github.com/cardamo/play-logback-access"))
 
 licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
 
-version := "0.5.2"
+version := "0.6.0"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play" % "2.5.14",
+  "com.typesafe.play" %% "play" % "2.6.0",
   "ch.qos.logback" % "logback-access" % "1.2.3",
   "javax.servlet" % "javax.servlet-api" % "3.1.0" % Optional
 )
@@ -24,7 +24,8 @@ libraryDependencies ++= Seq(
   "org.scalatestplus.play" %% "scalatestplus-play" % "3.0.0" % Test
 )
 
-scalaVersion := "2.11.7"
+scalaVersion := "2.12.2"
+crossScalaVersions := Seq("2.11.7", "2.12.2")
 
 scalacOptions ++= Seq("-feature","-deprecation")