playframework · jroper · Jun 24, 2015 · Jun 20, 2015 · Jun 23, 2015 · Jun 23, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,16 @@
-jdk: openjdk6
+jdk: 
+  - openjdk6
+  - oraclejdk8
 language: scala
 env:
   - PROJECT=statsd
   - PROJECT=redis
 script: cd util && sbt +publish-local && cd ../$PROJECT && sbt +test
+matrix:
+  exclude:
+  - jdk: openjdk6
+    env: PROJECT=redis
+  - jdk: oraclejdk8
+    env: PROJECT=statsd
+services:
+  - redis-server
diff --git a/redis/README.md b/redis/README.md
@@ -40,7 +40,7 @@ val o = play.api.cache.Cache.getAs[String]("mykey")
 
 
 #### Allows direct access to Jedis and Sedis: 
-
+play = 2.3.x:
 ```java
 //java
 import com.typesafe.plugin.RedisPlugin;
@@ -66,6 +66,19 @@ pool.withJedisClient { client =>
   Option[String] single = Dress.up(client).get("single")
 }
 ```
+play = 2.4.x:
+Because the underlying Sedis Pool was injected for the cache module to use, you can just inject the sedis Pool yourself, something like this:
+
+```scala
+//scala
+import javax.inject.Inject
+import org.sedis.Pool
+
+class TryIt @Inject()(sedisPool: Pool) extends Controller {
+   val directValue: String = sedisPool.withJedisClient(client => client.get("someKey"))
+}
+```
+
 # How to install
 
 * add 
@@ -82,10 +95,27 @@ play = 2.3.x:
 
 *  while this plugin is going to be loaded before the default cache implementation,  it's a good practice to disable the overwritten plugin:
 
-```
-#conf/application.conf
-ehcacheplugin=disabled
-```
+ ```
+ #conf/application.conf
+ ehcacheplugin=disabled
+ ```
+
+play = 2.4.x:
+```"com.typesafe" %% "play-modules-redis" % "2.4.0"``` to your dependencies
+
+* The default cache module (EhCache) will be used for all non-named cache UNLESS this module (RedisModule) is the only cache module that was loaded. If this module is the only cache module being loaded, it will work as expected on named and non-named cache. To disable the default cache module so that this Redis Module can be the default cache you must put this in your configuration:
+
+ ```
+ play.modules.disabled = ["play.api.cache.EhCacheModule"]
+ ```
+
+* This module supports play 2.4 NamedCaches through key namespacing on a single Sedis pool. To add additional namepsaces besides the default (play), the configuration would look like such:
+
+ ```
+ play.cache.redis.bindCaches = ["db-cache", "user-cache", "session-cache"]
+ ```
+
+
 
 # Sample
 

diff --git a/redis/build.sbt b/redis/build.sbt
@@ -1,26 +1,27 @@
-import scala.Some
+name := "play-modules-redis"
 
-name := "play-plugins-redis"
+organization := "com.typesafe.play.modules"
 
-organization := "com.typesafe.play.plugins"
-
-version := "2.3.1"
+version := "2.4.0"
 
 scalaVersion := "2.11.2"
 
 crossScalaVersions := Seq("2.11.2", "2.10.4")
 
 libraryDependencies ++= Seq(
-  "com.typesafe.play"         %% "play"               % "2.3.0"     % "provided",
+  "com.typesafe.play"         %% "play"               % "2.4.0"     % "provided",
+  "com.typesafe.play"         %% "play-cache"         % "2.4.0",
   "biz.source_code"           %  "base64coder"        % "2010-12-19",
-  "com.typesafe.play"         %% "play-cache"         % "2.3.0",
-  "com.typesafe.play.plugins" %% "play-plugins-util"  % "2.3.0",
-  "org.sedis"                 %%  "sedis"             % "1.2.2"
+  "org.sedis"                 %% "sedis"              % "1.2.2",
+  "com.typesafe.play"         %% "play-test"          % "2.4.0"     % "test",
+  "com.typesafe.play"         %% "play-specs2"        % "2.4.0"     % "test",
+  "org.specs2"                %% "specs2-core"        % "3.3.1"     % "test"
 )
 
 resolvers ++= Seq(
   "pk11 repo" at "http://pk11-scratch.googlecode.com/svn/trunk",
-  "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
+  "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/",
+  "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases"
 )
 
 publishTo <<= (version) { version: String =>
@@ -29,6 +30,6 @@ publishTo <<= (version) { version: String =>
   else                                   Some("releases"  at nexus + "maven-releases/")
 }
 
-javacOptions ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-encoding", "UTF-8")
+javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-encoding", "UTF-8")
 
 scalacOptions += "-deprecation"
diff --git a/redis/project/build.properties b/redis/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.5
+sbt.version=0.13.8
diff --git a/redis/sample/app/Global.java b/redis/sample/app/Global.java
diff --git a/redis/sample/app/controllers/Application.java b/redis/sample/app/controllers/Application.java
diff --git a/redis/sample/app/views/index.scala.html b/redis/sample/app/views/index.scala.html
diff --git a/redis/sample/app/views/main.scala.html b/redis/sample/app/views/main.scala.html
diff --git a/redis/sample/conf/application.conf b/redis/sample/conf/application.conf
diff --git a/redis/sample/conf/play.plugins b/redis/sample/conf/play.plugins
diff --git a/redis/sample/conf/routes b/redis/sample/conf/routes
diff --git a/redis/sample/project/Build.scala b/redis/sample/project/Build.scala
diff --git a/redis/sample/project/build.properties b/redis/sample/project/build.properties
diff --git a/redis/sample/project/plugins.sbt b/redis/sample/project/plugins.sbt
diff --git a/redis/sample/public/images/favicon.png b/redis/sample/public/images/favicon.png
diff --git a/redis/sample/public/javascripts/jquery-1.7.1.min.js b/redis/sample/public/javascripts/jquery-1.7.1.min.js
diff --git a/redis/sample/public/stylesheets/main.css b/redis/sample/public/stylesheets/main.css
diff --git a/redis/src/main/resources/reference.conf b/redis/src/main/resources/reference.conf
@@ -0,0 +1,16 @@
+play {
+
+  modules {
+    enabled += "com.typesafe.play.redis.RedisModule"
+  }
+
+  cache {
+    # The name of the default cache to use in redis
+    defaultCache = "play"
+
+    redis {
+      # The caches to bind
+      bindCaches = []
+    }
+  }
+}