Scala 2.13 (#73)

* Scala 2.13 * Work around sbt bug related to Scala 2.11
mumoshu · Jun 23, 2019 · 2175097 · 2175097
1 parent a3d55e4
commit 2175097
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,13 @@ language: scala
 scala:
   - 2.11.12
   - 2.12.8
-  - 2.13.0-M5
+  - 2.13.0
 services:
   - memcache
 jdk:
-  - oraclejdk8
+  - openjdk8
 env:
-  - PLAY_VERSION=2.7.0
+  - PLAY_VERSION=2.7.3
 # see https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
 before_install:
   - cat /etc/hosts

diff --git a/README.md b/README.md
@@ -352,6 +352,10 @@ Configure your configuration endpoint in `application.conf`:
 
 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}`
 
+0.10.0 Built for Play 2.7.0 and Scala 2.11.12 and 2.12.8. Artifact ID for this build is `play2-memcached-play27_2.1{1,2}`
+
+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}`
+
 ### Publishing to the central
 
 ```
@@ -362,9 +366,9 @@ PLAY_VERSION=2.5.0 sbt ++2.11.12 publishSigned sonatypeRelease
 PLAY_VERSION=2.6.0 sbt ++2.12.8 publishSigned sonatypeRelease
 
 # Play 2.7
-PLAY_VERSION=2.7.0 sbt ++2.11.12 publishSigned sonatypeRelease
-PLAY_VERSION=2.7.0 sbt ++2.12.8 publishSigned sonatypeRelease
-PLAY_VERSION=2.7.0 sbt ++2.13.0-M5 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
 ```
 
 ### Acknowledgement

diff --git a/build.sbt b/build.sbt
@@ -5,8 +5,9 @@ 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-M5"),
+  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

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.0")
+val playVersion = scala.util.Properties.envOrElse("PLAY_VERSION", "2.7.3")
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % playVersion)
 

diff --git a/publish.sh b/publish.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-PLAY_VERSION=2.7.0 sbt ++2.11.12 publishSigned sonatypeRelease
-PLAY_VERSION=2.7.0 sbt ++2.12.8 publishSigned sonatypeRelease
-PLAY_VERSION=2.7.0 sbt ++2.13.0-M5 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
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.0")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.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.0")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3")