From ce3a2f8f0758c0105f87a32b3bf4a2f629f92754 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 18 Nov 2019 15:42:04 +0100 Subject: [PATCH 1/4] Play 2.8 --- .travis.yml | 9 +++++---- README.md | 8 +++++++- build.sbt | 12 ++++-------- project/build.properties | 2 +- project/plugins.sbt | 2 +- publish.sh | 5 ++--- samples/java/build.sbt | 2 +- samples/java/project/build.properties | 2 +- samples/java/project/plugins.sbt | 2 +- samples/scala/build.sbt | 4 ++-- samples/scala/project/build.properties | 2 +- samples/scala/project/plugins.sbt | 2 +- 12 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa84b30..7a8bb86 100644 --- 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 index a2f4e3c..252424f 100644 --- 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 index 2f6e4fb..52b3cb7 100644 --- 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 index c0bab04..6adcdc7 100644 --- 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 index d971990..bb41e6e 100644 --- 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 index b3d3b8a..65df2f1 100755 --- 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 index e839b1b..2f632f4 100644 --- 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 index c0bab04..6adcdc7 100644 --- 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 index 7e904a1..fc302f7 100644 --- 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 index d07101f..cf48c57 100644 --- 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 index c0bab04..6adcdc7 100644 --- 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 index 7e904a1..fc302f7 100644 --- 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") From b6e02ff5e5faa891bc84d7a9fe1d048207c3b6c4 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 27 Nov 2019 09:50:15 +0100 Subject: [PATCH 2/4] Play 2.8.0-RC2 and sbt 1.3.4 --- .travis.yml | 2 +- README.md | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 2 +- publish.sh | 4 ++-- samples/java/project/build.properties | 2 +- samples/java/project/plugins.sbt | 2 +- samples/scala/project/build.properties | 2 +- samples/scala/project/plugins.sbt | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a8bb86..835748f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ services: jdk: - openjdk8 env: - - PLAY_VERSION=2.8.0-RC1 TRAVIS_JDK=8 + - PLAY_VERSION=2.8.0-RC2 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 diff --git a/README.md b/README.md index 252424f..8ef41f5 100644 --- a/README.md +++ b/README.md @@ -373,8 +373,8 @@ 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 +PLAY_VERSION=2.8.0-RC2 sbt ++2.12.10 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0-RC2 sbt ++2.13.1 publishSigned sonatypeRelease ``` ### Acknowledgement diff --git a/project/build.properties b/project/build.properties index 6adcdc7..5a9ed92 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.3 +sbt.version=1.3.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index bb41e6e..d37ca27 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ ivyLoggingLevel := UpdateLogging.Full -val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.8.0-RC1") +val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.8.0-RC2") addSbtPlugin("com.typesafe.play" % "sbt-plugin" % playVersion) diff --git a/publish.sh b/publish.sh index 65df2f1..6200f80 100755 --- a/publish.sh +++ b/publish.sh @@ -1,4 +1,4 @@ #!/bin/bash -PLAY_VERSION=2.8.0-RC1 sbt ++2.12.10 publishSigned sonatypeRelease -PLAY_VERSION=2.8.0-RC1 sbt ++2.13.1 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0-RC2 sbt ++2.12.10 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0-RC2 sbt ++2.13.1 publishSigned sonatypeRelease diff --git a/samples/java/project/build.properties b/samples/java/project/build.properties index 6adcdc7..5a9ed92 100644 --- a/samples/java/project/build.properties +++ b/samples/java/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.3 +sbt.version=1.3.4 diff --git a/samples/java/project/plugins.sbt b/samples/java/project/plugins.sbt index fc302f7..1e98493 100644 --- 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.8.0-RC1") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0-RC2") diff --git a/samples/scala/project/build.properties b/samples/scala/project/build.properties index 6adcdc7..5a9ed92 100644 --- a/samples/scala/project/build.properties +++ b/samples/scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.3 +sbt.version=1.3.4 diff --git a/samples/scala/project/plugins.sbt b/samples/scala/project/plugins.sbt index fc302f7..1e98493 100644 --- 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.8.0-RC1") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0-RC2") From a8cc46f307dd8886484559ebf71657cca4e824b4 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 7 Dec 2019 14:00:22 +0100 Subject: [PATCH 3/4] Play 2.8.0-RC5 --- .travis.yml | 4 +--- README.md | 4 ++-- project/plugins.sbt | 2 +- publish.sh | 4 ++-- samples/java/project/plugins.sbt | 2 +- samples/scala/project/plugins.sbt | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 835748f..f2ae717 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,8 @@ scala: - 2.13.1 services: - memcache -jdk: - - openjdk8 env: - - PLAY_VERSION=2.8.0-RC2 TRAVIS_JDK=8 + - PLAY_VERSION=2.8.0-RC5 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 diff --git a/README.md b/README.md index 8ef41f5..e9ec181 100644 --- a/README.md +++ b/README.md @@ -373,8 +373,8 @@ 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-RC2 sbt ++2.12.10 publishSigned sonatypeRelease -PLAY_VERSION=2.8.0-RC2 sbt ++2.13.1 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0-RC5 sbt ++2.12.10 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0-RC5 sbt ++2.13.1 publishSigned sonatypeRelease ``` ### Acknowledgement diff --git a/project/plugins.sbt b/project/plugins.sbt index d37ca27..a20ab9d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ ivyLoggingLevel := UpdateLogging.Full -val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.8.0-RC2") +val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.8.0-RC5") addSbtPlugin("com.typesafe.play" % "sbt-plugin" % playVersion) diff --git a/publish.sh b/publish.sh index 6200f80..2778854 100755 --- a/publish.sh +++ b/publish.sh @@ -1,4 +1,4 @@ #!/bin/bash -PLAY_VERSION=2.8.0-RC2 sbt ++2.12.10 publishSigned sonatypeRelease -PLAY_VERSION=2.8.0-RC2 sbt ++2.13.1 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0-RC5 sbt ++2.12.10 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0-RC5 sbt ++2.13.1 publishSigned sonatypeRelease diff --git a/samples/java/project/plugins.sbt b/samples/java/project/plugins.sbt index 1e98493..bad35fa 100644 --- 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.8.0-RC2") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0-RC5") diff --git a/samples/scala/project/plugins.sbt b/samples/scala/project/plugins.sbt index 1e98493..bad35fa 100644 --- 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.8.0-RC2") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0-RC5") From 2b506d1d87f00e3dc997a180ae74a5924a417e1c Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 20 Dec 2019 12:55:09 +0100 Subject: [PATCH 4/4] Play 2.8.0 GA --- .travis.yml | 2 +- README.md | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 2 +- publish.sh | 4 ++-- samples/java/project/build.properties | 2 +- samples/java/project/plugins.sbt | 2 +- samples/scala/project/build.properties | 2 +- samples/scala/project/plugins.sbt | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2ae717..e906581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ scala: services: - memcache env: - - PLAY_VERSION=2.8.0-RC5 TRAVIS_JDK=8 + - PLAY_VERSION=2.8.0 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 diff --git a/README.md b/README.md index e9ec181..67036f6 100644 --- a/README.md +++ b/README.md @@ -373,8 +373,8 @@ 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-RC5 sbt ++2.12.10 publishSigned sonatypeRelease -PLAY_VERSION=2.8.0-RC5 sbt ++2.13.1 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0 sbt ++2.12.10 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0 sbt ++2.13.1 publishSigned sonatypeRelease ``` ### Acknowledgement diff --git a/project/build.properties b/project/build.properties index 5a9ed92..6624da7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.4 +sbt.version=1.3.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index a20ab9d..0182508 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ ivyLoggingLevel := UpdateLogging.Full -val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.8.0-RC5") +val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.8.0") addSbtPlugin("com.typesafe.play" % "sbt-plugin" % playVersion) diff --git a/publish.sh b/publish.sh index 2778854..d85041f 100755 --- a/publish.sh +++ b/publish.sh @@ -1,4 +1,4 @@ #!/bin/bash -PLAY_VERSION=2.8.0-RC5 sbt ++2.12.10 publishSigned sonatypeRelease -PLAY_VERSION=2.8.0-RC5 sbt ++2.13.1 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0 sbt ++2.12.10 publishSigned sonatypeRelease +PLAY_VERSION=2.8.0 sbt ++2.13.1 publishSigned sonatypeRelease diff --git a/samples/java/project/build.properties b/samples/java/project/build.properties index 5a9ed92..6624da7 100644 --- a/samples/java/project/build.properties +++ b/samples/java/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.4 +sbt.version=1.3.5 diff --git a/samples/java/project/plugins.sbt b/samples/java/project/plugins.sbt index bad35fa..2a734f4 100644 --- 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.8.0-RC5") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0") diff --git a/samples/scala/project/build.properties b/samples/scala/project/build.properties index 5a9ed92..6624da7 100644 --- a/samples/scala/project/build.properties +++ b/samples/scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.4 +sbt.version=1.3.5 diff --git a/samples/scala/project/plugins.sbt b/samples/scala/project/plugins.sbt index bad35fa..2a734f4 100644 --- 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.8.0-RC5") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0")