Add Play 2.8.x compatibility

Play's 2.8 changelog does not mention much actually needing to change from the build pipeline perspective, so an easy string replacement for the integration test fixtures to verify and test should be enough to verify. Based on the previous PR from #133, this expands the changes to ensure the integration tests pass as well. Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
gradle · Oct 20, 2020 · 432efec · 432efec
1 parent ddbc171
commit 432efec
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,8 @@ jobs:
       env: GRADLE_TASK=integrationTest PLAY_VERSION=2.6.25
     - name: "Play 2.7.5 Integration Tests"
       env: GRADLE_TASK=integrationTest PLAY_VERSION=2.7.5
+    - name: "Play 2.8.2 Integration Tests"
+      env: GRADLE_TASK=integrationTest PLAY_VERSION=2.8.2
     - name: "Documentation Tests"
       env: GRADLE_TASK=docTest PLAY_VERSION=not_used
 

diff --git a/src/docs/asciidoc/00-intro.adoc b/src/docs/asciidoc/00-intro.adoc
@@ -13,7 +13,7 @@ The Play plugin defines the following requirements for a consuming build.
 
 * The build has to be run with Java 8 or higher.
 * The build has to use Gradle 5.0 or higher.
-* The supported Play versions are 2.4.x, 2.5.x, 2.6.x, and 2.7.x.
+* The supported Play versions are 2.4.x, 2.5.x, 2.6.x, 2.7.x, and 2.8.x.
 
 === Limitations
 

diff --git a/src/docs/asciidoc/11-play-framework.adoc b/src/docs/asciidoc/11-play-framework.adoc
@@ -9,6 +9,10 @@ The following versions of Play and Scala are supported:
 |===
 | Play | Scala | Java
 
+| 2.8.x
+| 2.12 and 2.13
+| 1.8
+
 | 2.7.x
 | 2.11, 2.12 and 2.13
 | 1.8

diff --git a/...tegTestFixtures/groovy/org/gradle/playframework/fixtures/multiversion/PlayCoverage.groovy b/...tegTestFixtures/groovy/org/gradle/playframework/fixtures/multiversion/PlayCoverage.groovy
@@ -14,8 +14,7 @@ final class PlayCoverage {
             VersionNumber.parse('2.4.11'),
             VersionNumber.parse('2.5.19'),
             VersionNumber.parse('2.7.5'),
-            // Not supported yet
-            // VersionNumber.parse('2.8.0'),
+            VersionNumber.parse('2.8.0'),
             DEFAULT
     ]
 }
diff --git a/...g/gradle/playframework/fixtures/app/advancedplayapp/app/controllers/Application.scala.ftl b/...g/gradle/playframework/fixtures/app/advancedplayapp/app/controllers/Application.scala.ftl
@@ -16,7 +16,7 @@
 
 package controllers
 
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 import javax.inject._
 import play.api._
 import play.api.mvc._

diff --git a/...g/gradle/playframework/fixtures/app/advancedplayapp/app/controllers/jva/PureJava.java.ftl b/...g/gradle/playframework/fixtures/app/advancedplayapp/app/controllers/jva/PureJava.java.ftl
@@ -21,7 +21,7 @@ import jva.html.*;
 
 public class PureJava extends Controller {
 
-<#if playVersion == "2.7">
+<#if playVersion == "2.8" || playVersion == "2.7">
     public Result index() {
 <#else>
     public static Result index() {

diff --git a/...gradle/playframework/fixtures/app/advancedplayapp/app/controllers/scla/MixedJava.java.ftl b/...gradle/playframework/fixtures/app/advancedplayapp/app/controllers/scla/MixedJava.java.ftl
@@ -22,7 +22,7 @@ import views.html.*;
 
 public class MixedJava extends Controller {
 
-<#if playVersion == "2.7">
+<#if playVersion == "2.8" || playVersion == "2.7">
     public Result index() {
 <#else>
     public static Result index() {

diff --git a/.../playframework/fixtures/app/advancedplayapp/app/special/strangename/Application.scala.ftl b/.../playframework/fixtures/app/advancedplayapp/app/special/strangename/Application.scala.ftl
@@ -16,7 +16,7 @@
 
 package special.strangename
 
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 import javax.inject._
 import play.api._
 import play.api.mvc._

diff --git a/...Fixtures/resources/org/gradle/playframework/fixtures/app/advancedplayapp/build.gradle.ftl b/...Fixtures/resources/org/gradle/playframework/fixtures/app/advancedplayapp/build.gradle.ftl
@@ -14,7 +14,7 @@ sourceSets {
     }
 }
 
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 dependencies {
     implementation "com.typesafe.play:play-guice_2.12:2.6.15"
     implementation "ch.qos.logback:logback-classic:1.2.3"

diff --git a/...tFixtures/resources/org/gradle/playframework/fixtures/app/advancedplayapp/conf/routes.ftl b/...tFixtures/resources/org/gradle/playframework/fixtures/app/advancedplayapp/conf/routes.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 # Routes
 GET /          @controllers.Application.index
 GET /root      @controllers.Application.root

diff --git a/...res/resources/org/gradle/playframework/fixtures/app/advancedplayapp/conf/scala.routes.ftl b/...res/resources/org/gradle/playframework/fixtures/app/advancedplayapp/conf/scala.routes.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 GET        /one         controllers.scla.MixedJava.index
 POST       /two         @special.strangename.Application.index
 

diff --git a/.../org/gradle/playframework/fixtures/app/basicplayapp/app/controllers/Application.scala.ftl b/.../org/gradle/playframework/fixtures/app/basicplayapp/app/controllers/Application.scala.ftl
@@ -16,7 +16,7 @@
 
 package controllers
 
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 import javax.inject._
 import play.api._
 import play.api.mvc._

diff --git a/...estFixtures/resources/org/gradle/playframework/fixtures/app/basicplayapp/build.gradle.ftl b/...estFixtures/resources/org/gradle/playframework/fixtures/app/basicplayapp/build.gradle.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 plugins {
     id 'org.gradle.playframework'
 }

diff --git a/...TestFixtures/resources/org/gradle/playframework/fixtures/app/basicplayapp/conf/routes.ftl b/...TestFixtures/resources/org/gradle/playframework/fixtures/app/basicplayapp/conf/routes.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 # Routes
 # Home page
 GET     /                           @controllers.Application.index

diff --git a/.../playframework/fixtures/app/playappwithdependencies/app/controllers/Application.scala.ftl b/.../playframework/fixtures/app/playappwithdependencies/app/controllers/Application.scala.ftl
@@ -16,7 +16,7 @@
 
 package controllers
 
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 import javax.inject._
 import com.google.common.base.Strings
 import play.api._

diff --git a/.../resources/org/gradle/playframework/fixtures/app/playappwithdependencies/build.gradle.ftl b/.../resources/org/gradle/playframework/fixtures/app/playappwithdependencies/build.gradle.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 plugins {
     id 'org.gradle.playframework'
 }

diff --git a/...s/resources/org/gradle/playframework/fixtures/app/playappwithdependencies/conf/routes.ftl b/...s/resources/org/gradle/playframework/fixtures/app/playappwithdependencies/conf/routes.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 # Routes
 # Home page
 GET     /                           @controllers.Application.index

diff --git a/...radle/playframework/fixtures/app/playcompositebuild/app/controllers/Application.scala.ftl b/...radle/playframework/fixtures/app/playcompositebuild/app/controllers/Application.scala.ftl
@@ -1,6 +1,6 @@
 package controllers
 
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 import javax.inject._
 import play.api._
 import play.api.mvc._

diff --git a/...tures/resources/org/gradle/playframework/fixtures/app/playcompositebuild/build.gradle.ftl b/...tures/resources/org/gradle/playframework/fixtures/app/playcompositebuild/build.gradle.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 plugins {
     id 'org.gradle.playframework'
 }

diff --git a/...xtures/resources/org/gradle/playframework/fixtures/app/playcompositebuild/conf/routes.ftl b/...xtures/resources/org/gradle/playframework/fixtures/app/playcompositebuild/conf/routes.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 GET     /                          @controllers.Application.index
 GET     /shutdown                  @controllers.Application.shutdown
 GET     /assets/*file              @controllers.Assets.at(path="/public", file)

diff --git a/...ixtures/resources/org/gradle/playframework/fixtures/app/playmultiproject/build.gradle.ftl b/...ixtures/resources/org/gradle/playframework/fixtures/app/playmultiproject/build.gradle.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 plugins {
     id 'org.gradle.playframework'
 }

diff --git a/...playframework/fixtures/app/playmultiproject/primary/app/controllers/Application.scala.ftl b/...playframework/fixtures/app/playmultiproject/primary/app/controllers/Application.scala.ftl
@@ -1,6 +1,6 @@
 package controllers
 
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 import javax.inject._
 import play.api._
 import play.api.mvc._

diff --git a/...resources/org/gradle/playframework/fixtures/app/playmultiproject/primary/build.gradle.ftl b/...resources/org/gradle/playframework/fixtures/app/playmultiproject/primary/build.gradle.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 plugins {
     id 'org.gradle.playframework'
 }

diff --git a/.../org/gradle/playframework/fixtures/app/playmultiproject/primary/conf/application.conf.ftl b/.../org/gradle/playframework/fixtures/app/playmultiproject/primary/conf/application.conf.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 # https://www.playframework.com/documentation/2.6.x/ApplicationSecret
 play.http.secret.key="somethingsecret"
 

diff --git a/.../resources/org/gradle/playframework/fixtures/app/playmultiproject/primary/conf/routes.ftl b/.../resources/org/gradle/playframework/fixtures/app/playmultiproject/primary/conf/routes.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 GET     /                          @controllers.Application.index
 GET     /shutdown                  @controllers.Application.shutdown
 GET     /submodule                 @controllers.submodule.Application.index

diff --git a/...k/fixtures/app/playmultiproject/submodule/app/controllers/submodule/Application.scala.ftl b/...k/fixtures/app/playmultiproject/submodule/app/controllers/submodule/Application.scala.ftl
@@ -1,6 +1,6 @@
 package controllers.submodule
 
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 import javax.inject._
 import play.api._
 import play.api.mvc._

diff --git a/...sources/org/gradle/playframework/fixtures/app/playmultiproject/submodule/build.gradle.ftl b/...sources/org/gradle/playframework/fixtures/app/playmultiproject/submodule/build.gradle.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 plugins {
     id 'org.gradle.playframework'
 }

diff --git a/...Fixtures/resources/org/gradle/playframework/fixtures/app/shared/conf/application.conf.ftl b/...Fixtures/resources/org/gradle/playframework/fixtures/app/shared/conf/application.conf.ftl
@@ -1,4 +1,4 @@
-<#if playVersion == "2.7" || playVersion == "2.6">
+<#if playVersion == "2.8" || playVersion == "2.7" || playVersion == "2.6">
 play.http.secret.key="TY9[b`xw2MeXUt;M<i_B0kUKm8/?PD1cS1WhFYyZ[1^6`Apew34q6DyNL=UqG/1l"
 
 <#else>

diff --git a/src/main/java/org/gradle/playframework/extensions/internal/PlayMajorVersion.java b/src/main/java/org/gradle/playframework/extensions/internal/PlayMajorVersion.java
@@ -13,9 +13,8 @@ public enum PlayMajorVersion {
     PLAY_2_4_X("2.4.x", true, "2.11", "2.10"),
     PLAY_2_5_X("2.5.x", true,"2.11"),
     PLAY_2_6_X("2.6.x", true, "2.12", "2.11"),
-    PLAY_2_7_X("2.7.x", false, "2.13", "2.12", "2.11");
-    // Not supported yet
-    // PLAY_2_8_X("2.8.x", false, "2.13", "2.12");
+    PLAY_2_7_X("2.7.x", false, "2.13", "2.12", "2.11"),
+    PLAY_2_8_X("2.8.x", false, "2.13", "2.12");
 
     private final String name;
     private final boolean supportForStaticRoutes;

diff --git a/src/main/java/org/gradle/playframework/tools/internal/routes/RoutesCompilerFactory.java b/src/main/java/org/gradle/playframework/tools/internal/routes/RoutesCompilerFactory.java
@@ -24,6 +24,7 @@ public static VersionedRoutesCompilerAdapter createAdapter(PlayPlatform playPlat
             case PLAY_2_6_X:
                 return new RoutesCompilerAdapterV24X(playVersion, scalaVersion);
             case PLAY_2_7_X:
+            case PLAY_2_8_X:
             default:
                 return new RoutesCompilerAdapterV27X(playVersion, scalaVersion);
         }