Play 2.8

mumoshu · Nov 18, 2019 · ce3a2f8 · ce3a2f8
1 parent d4fb4f0
commit ce3a2f8
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,22 @@
 language: scala
 scala:
-  - 2.11.12
-  - 2.12.8
-  - 2.13.0
+  - 2.12.10
+  - 2.13.1
 services:
   - memcache
 jdk:
   - openjdk8
 env:
-  - PLAY_VERSION=2.7.3
+  - PLAY_VERSION=2.8.0-RC1 TRAVIS_JDK=8
 # see https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
 before_install:
+  - curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
   - cat /etc/hosts
   - sudo hostname "$(hostname | cut -c1-63)"
   - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts > /tmp/hosts
   - sudo mv /tmp/hosts /etc/hosts
   - cat /etc/hosts
+install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version
 # see https://docs.travis-ci.com/user/languages/scala#Default-Test-Command about $TRAVIS_SCALA_VERSION
 script:
   - sbt ++$TRAVIS_SCALA_VERSION test
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Add the following dependency to your Play project:
 
 ### Library dependencies
 
-For Play 2.6.x:
+For Play 2.6.x and newer:
 !!! Changed `play.modules.cache.*` config keys to `play.cache.*` !!!
 
 ```scala
@@ -356,6 +356,8 @@ Configure your configuration endpoint in `application.conf`:
 
 0.10.1 Built for Play 2.7.3 and Scala 2.13.0, 2.11.12 and 2.12.8. Artifact ID for this build is `play2-memcached-play27_2.1{1,2,3}`
 
+0.11.0 Built for Play 2.8.0 and Scala 2.13.1 and 2.12.10. Artifact ID for this build is `play2-memcached-play28_2.1{2,3}`
+
 ### Publishing to the central
 
 ```
@@ -369,6 +371,10 @@ PLAY_VERSION=2.6.0 sbt ++2.12.8 publishSigned sonatypeRelease
 PLAY_VERSION=2.7.3 sbt ++2.11.12 publishSigned sonatypeRelease
 PLAY_VERSION=2.7.3 sbt ++2.12.8 publishSigned sonatypeRelease
 PLAY_VERSION=2.7.3 sbt ++2.13.0 publishSigned sonatypeRelease
+
+# Play 2.8
+PLAY_VERSION=2.8.0-RC1 sbt ++2.12.10 publishSigned sonatypeRelease
+PLAY_VERSION=2.8.0-RC1 sbt ++2.13.1 publishSigned sonatypeRelease
 ```
 
 ### Acknowledgement

diff --git a/build.sbt b/build.sbt
@@ -1,16 +1,12 @@
 val appName         = "play2-memcached-" + playShortName
-val appVersion      = "0.10.1"
+val appVersion      = "0.11.0-SNAPSHOT"
 val spymemcached    = "net.spy" % "spymemcached" % "2.12.3"
 val h2databaseTest  = "com.h2database" % "h2" % "1.4.196" % Test
 
 lazy val baseSettings = Seq(
-  scalaVersion := "2.12.8",
-  crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0"),
-  parallelExecution in Test := false,
-  fork in Test := true, // can be removed with sbt 1.3.0, see https://github.com/sbt/sbt/issues/4609
-  // Workaround until omnidoc gets published for Scala 2.13
-  // http://central.maven.org/maven2/com/typesafe/play/play-omnidoc_2.13/
-  PlayKeys.playOmnidoc := false
+  scalaVersion := "2.13.1",
+  crossScalaVersions := Seq("2.12.10", "2.13.1"),
+  parallelExecution in Test := false
 )
 
 def playShortName: String = {

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 ivyLoggingLevel := UpdateLogging.Full
 
-val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.7.3")
+val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.8.0-RC1")
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % playVersion)
 

diff --git a/publish.sh b/publish.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 
-PLAY_VERSION=2.7.3 sbt ++2.11.12 publishSigned sonatypeRelease
-PLAY_VERSION=2.7.3 sbt ++2.12.8 publishSigned sonatypeRelease
-PLAY_VERSION=2.7.3 sbt ++2.13.0 publishSigned sonatypeRelease
+PLAY_VERSION=2.8.0-RC1 sbt ++2.12.10 publishSigned sonatypeRelease
+PLAY_VERSION=2.8.0-RC1 sbt ++2.13.1 publishSigned sonatypeRelease
diff --git a/samples/java/build.sbt b/samples/java/build.sbt
@@ -2,5 +2,5 @@ libraryDependencies ++= Seq(
   javaJdbc,
   cacheApi,
   javaWs,
-  "com.github.mumoshu" %% "play2-memcached-play27" % "0.10.0"
+  "com.github.mumoshu" %% "play2-memcached-play28" % "0.11.0-SNAPSHOT"
 )
diff --git a/samples/java/project/build.properties b/samples/java/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.3
diff --git a/samples/java/project/plugins.sbt b/samples/java/project/plugins.sbt
@@ -1,3 +1,3 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0-RC1")
 
diff --git a/samples/scala/build.sbt b/samples/scala/build.sbt
@@ -2,8 +2,8 @@ libraryDependencies ++= Seq(
   jdbc,
   cacheApi,
   ws,
-  "com.github.mumoshu" %% "play2-memcached-play27" % "0.10.0",
+  "com.github.mumoshu" %% "play2-memcached-play28" % "0.11.0-SNAPSHOT",
   specs2 % Test
 )
 
-resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases"
+resolvers += "scalaz-bintray" at "https://dl.bintray.com/scalaz/releases"
diff --git a/samples/scala/project/build.properties b/samples/scala/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.3
diff --git a/samples/scala/project/plugins.sbt b/samples/scala/project/plugins.sbt
@@ -1,3 +1,3 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0-RC1")