Play 2.7.0-RC3 and sbt upgrade

.travis.yml

@@ -1,14 +1,14 @@
 language: scala
 scala:
   - 2.11.12
-  - 2.12.6
+  - 2.12.7
 # - 2.13.0-M4
 services:
   - memcache
 jdk:
   - oraclejdk8
 env:
-  - PLAY_VERSION=2.7.0-M2
+  - PLAY_VERSION=2.7.0-RC8
 # see https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
 before_install:
   - cat /etc/hosts

README.md

@@ -350,6 +350,8 @@ Configure your configuration endpoint in `application.conf`:
 
 0.10.0-M2 Built for Play 2.7.0-M2 and Scala 2.11.12 and 2.12.6. Artifact ID for this build is `play2-memcached-play27_2.1{1,2}`
 
+0.10.0-RC3 Built for Play 2.7.0-RC8 and Scala 2.11.12 and 2.12.7. Artifact ID for this build is `play2-memcached-play27_2.1{1,2}`
+
 ### Publishing to the central
 
 ```

build.sbt

@@ -0,0 +1,96 @@
+val appName         = "play2-memcached-" + playShortName
+val appVersion      = "0.10.0-RC3"
+val spymemcached    = "net.spy" % "spymemcached" % "2.12.3"
+val h2databaseTest  = "com.h2database" % "h2" % "1.4.196" % Test
+
+lazy val baseSettings = Seq(
+  scalaVersion := "2.12.7",
+  crossScalaVersions := Seq("2.11.12", "2.12.7"),
+  parallelExecution in Test := false
+)
+
+def playShortName: String = {
+  val version = play.core.PlayVersion.current
+  val majorMinor = version.split("""\.""").take(2).mkString("")
+  s"play$majorMinor"
+}
+
+lazy val root = Project("root", base = file("."))
+  .settings(baseSettings: _*)
+  .settings(
+    publishLocal := {},
+    publish := {}
+  ).aggregate(plugin, scalaSample, javaSample)
+
+lazy val plugin = Project(appName, base = file("plugin"))
+  .settings(baseSettings: _*)
+  .settings(
+    libraryDependencies += h2databaseTest,
+    libraryDependencies += spymemcached,
+    libraryDependencies += playCore % Provided,
+    libraryDependencies += cacheApi % Provided,
+    libraryDependencies += specs2 % Test,
+    organization := "com.github.mumoshu",
+    version := appVersion,
+    //scalacOptions += "-deprecation",
+    publishTo := {
+      val v = version.value
+      val nexus = "https://oss.sonatype.org/"
+      if (v.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
+      else                             Some("releases" at nexus + "service/local/staging/deploy/maven2")
+    },
+    publishMavenStyle := true,
+    publishArtifact in Test := false,
+    pomIncludeRepository := { _ => false },
+    pomExtra := (
+      <url>https://github.com/mumoshu/play2-memcached</url>
+        <licenses>
+          <license>
+            <name>BSD-style</name>
+            <url>http://www.opensource.org/licenses/bsd-license.php</url>
+            <distribution>repo</distribution>
+          </license>
+        </licenses>
+        <scm>
+          <url>git@github.com:mumoshu/play2-memcached.git</url>
+          <connection>scm:git:git@github.com:mumoshu/play2-memcached.git</connection>
+        </scm>
+        <developers>
+          <developer>
+            <id>you</id>
+            <name>KUOKA Yusuke</name>
+            <url>https://github.com/mumoshu</url>
+          </developer>
+        </developers>
+      ),
+    unmanagedSourceDirectories in Compile := {
+      (unmanagedSourceDirectories in Compile).value ++ Seq((sourceDirectory in Compile).value)
+    },
+    unmanagedSourceDirectories in Test := {
+      (unmanagedSourceDirectories in Test).value ++ Seq((sourceDirectory in Test).value)
+    }
+  )
+
+lazy val scalaSample = Project(
+  "scala-sample",
+  file("samples/scala")
+).enablePlugins(PlayScala)
+.settings(baseSettings: _*)
+.settings(
+  libraryDependencies += cacheApi,
+  libraryDependencies += h2databaseTest,
+  publishLocal := {},
+  publish := {}
+).dependsOn(plugin)
+
+lazy val javaSample = Project(
+  "java-sample",
+  file("samples/java")
+).enablePlugins(PlayJava)
+.settings(baseSettings: _*)
+.settings(
+  libraryDependencies += cacheApi,
+  libraryDependencies += h2databaseTest,
+  publishLocal := {},
+  publish := {}
+).dependsOn(plugin)

plugin/src/test/MemcachedSpec.scala

@@ -1,17 +1,13 @@
+import com.github.mumoshu.play2.memcached._
 import net.spy.memcached.MemcachedClient
 import org.specs2.mutable._
-import play.api.test._
-
-import com.github.mumoshu.play2.memcached._
 import play.api.cache.AsyncCacheApi
-import play.api.inject._
+import play.api.inject.guice.GuiceApplicationBuilder
 import play.cache.NamedCacheImpl
-import play.test.WithApplication
+import play.api.test.WithApplication
 
 import scala.collection.JavaConverters._
 
-import play.api.{Configuration, Environment, ApplicationLoader}
-
 object MemcachedSpec extends Specification {
 
   sequential
@@ -55,29 +51,24 @@ object MemcachedSpec extends Specification {
   }
 
   "Injector" should {
-    import play.api.inject.bind
-
-    def app = play.test.Helpers.fakeApplication(
-      configurationMap.asJava
-    )
 
-    def injector = app.injector
+    def app = GuiceApplicationBuilder().configure(configurationMap).build()
 
-    "provide memcached clients" in {
-      val memcachedClient = injector.instanceOf(play.api.inject.BindingKey(classOf[MemcachedClient]))
+    "provide memcached clients" in new WithApplication(app) {
+      val memcachedClient = app.injector.instanceOf(play.api.inject.BindingKey(classOf[MemcachedClient]))
 
       memcachedClient must beAnInstanceOf[MemcachedClient]
     }
 
-    "provide a CacheApi implementation backed by memcached" in {
-      val cacheApi = injector.instanceOf(play.api.inject.BindingKey(classOf[AsyncCacheApi]))
+    "provide a CacheApi implementation backed by memcached" in new WithApplication(app) {
+      val cacheApi = app.injector.instanceOf(play.api.inject.BindingKey(classOf[AsyncCacheApi]))
 
       cacheApi must beAnInstanceOf[MemcachedCacheApi]
       cacheApi.asInstanceOf[MemcachedCacheApi].namespace must equalTo ("default")
     }
 
-    "provide a named CacheApi implementation backed by memcached" in {
-      val cacheApi = injector.instanceOf(play.api.inject.BindingKey(classOf[AsyncCacheApi]).qualifiedWith(new NamedCacheImpl("secondary")))
+    "provide a named CacheApi implementation backed by memcached" in new WithApplication(app) {
+      val cacheApi = app.injector.instanceOf(play.api.inject.BindingKey(classOf[AsyncCacheApi]).qualifiedWith(new NamedCacheImpl("secondary")))
 
       cacheApi must beAnInstanceOf[MemcachedCacheApi]
       cacheApi.asInstanceOf[MemcachedCacheApi].namespace must equalTo ("secondary")

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=1.2.6

project/plugins.sbt

@@ -1,6 +1,6 @@
 ivyLoggingLevel := UpdateLogging.Full
 
-val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.7.0-M2")
+val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.7.0-RC8")
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % playVersion)
 

publish.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PLAY_VERSION=2.7.0-M2 sbt ++2.11.12 publish-signed
-PLAY_VERSION=2.7.0-M2 sbt ++2.12.6 publish-signed
+PLAY_VERSION=2.7.0-RC8 sbt ++2.11.12 publishSigned
+PLAY_VERSION=2.7.0-RC8 sbt ++2.12.7 publishSigned
 # not working yet, wait for final Play 2.7 and Scala 2.13 release:
-#PLAY_VERSION=2.7.0-M2 sbt ++2.13.0-M4 publish-signed
+#PLAY_VERSION=2.7.0-RC8 sbt ++2.13.0-M4 publishSigned

samples/java/build.sbt

@@ -2,5 +2,5 @@ libraryDependencies ++= Seq(
   javaJdbc,
   cacheApi,
   javaWs,
-  "com.github.mumoshu" %% "play2-memcached-play27" % "0.10.0-M2"
+  "com.github.mumoshu" %% "play2-memcached-play27" % "0.10.0-RC3"
 )

samples/java/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=1.2.6

samples/java/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.0-M2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.0-RC8")
 

samples/scala/build.sbt

@@ -2,7 +2,7 @@ libraryDependencies ++= Seq(
   jdbc,
   cacheApi,
   ws,
-  "com.github.mumoshu" %% "play2-memcached-play27" % "0.10.0-M2",
+  "com.github.mumoshu" %% "play2-memcached-play27" % "0.10.0-RC3",
   specs2 % Test
 )
 

samples/scala/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=1.2.6

samples/scala/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.0-M2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.0-RC8")