Merge pull request #221 from guardian/drop-play-v2.7

Drop support for Play v2.7
guardian · Apr 3, 2024 · 0b29852 · 0b29852
2 parents 0d1af87 + 2183c5e
commit 0b29852
Show file tree

Hide file tree

Showing 35 changed files with 11 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ target/
 .idea/
 *.log
 .bsp/
+.DS_Store
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+java corretto-11.0.22.7.1
diff --git a/build.sbt b/build.sbt
@@ -8,8 +8,8 @@ ThisBuild / scalaVersion := "2.13.13"
 
 val artifactPomMetadataSettings = Seq(
   organization := "com.gu.play-googleauth",
-  licenses := Seq("Apache V2" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
-  description := "Simple Google authentication module for Play 2 & 3"
+  licenses := Seq(License.Apache2),
+  description := "Simple Google authentication module for the Play web framework"
 )
 
 def projectWithPlayVersion(playVersion: PlayVersion) =
@@ -19,23 +19,21 @@ def projectWithPlayVersion(playVersion: PlayVersion) =
     Compile / unmanagedSourceDirectories += baseDirectory.value / playVersion.pekkoOrAkkaSrcFolder,
 
     libraryDependencies ++= Seq(
-      "com.gu.play-secret-rotation" %% "core" % "7.1.1",
+      "com.gu.play-secret-rotation" %% "core" % "8.1.0",
       "org.typelevel" %% "cats-core" % "2.10.0",
       commonsCodec,
       "org.scalatest" %% "scalatest" % "3.2.18" % Test,
-      "software.amazon.awssdk" % "ssm" % "2.24.12" % Test
+      "software.amazon.awssdk" % "ssm" % "2.25.23" % Test
     ) ++ googleDirectoryAPI ++ playVersion.playLibs,
 
     artifactPomMetadataSettings
   )
 
-lazy val `play-v27` = projectWithPlayVersion(PlayVersion.V27)
 lazy val `play-v28` = projectWithPlayVersion(PlayVersion.V28)
 lazy val `play-v29` = projectWithPlayVersion(PlayVersion.V29)
 lazy val `play-v30` = projectWithPlayVersion(PlayVersion.V30)
 
 lazy val `play-googleauth-root` = (project in file(".")).aggregate(
-  `play-v27`,
   `play-v28`,
   `play-v29`,
   `play-v30`

diff --git a/play-v28/src b/play-v28/src
diff --git a/play-v28/src-akka b/play-v28/src-akka
diff --git a/.../gu/googleauth/internal/AkkaOrPekko.scala → .../gu/googleauth/internal/AkkaOrPekko.scala b/.../gu/googleauth/internal/AkkaOrPekko.scala → .../gu/googleauth/internal/AkkaOrPekko.scala
diff --git a/.../gu/googleauth/ServiceAccountHelper.scala → .../gu/googleauth/ServiceAccountHelper.scala b/.../gu/googleauth/ServiceAccountHelper.scala → .../gu/googleauth/ServiceAccountHelper.scala
diff --git a/.../gu/googleauth/TwoFactorAuthChecker.scala → .../gu/googleauth/TwoFactorAuthChecker.scala b/.../gu/googleauth/TwoFactorAuthChecker.scala → .../gu/googleauth/TwoFactorAuthChecker.scala
diff --git a/...ain/scala/com/gu/googleauth/actions.scala → ...ain/scala/com/gu/googleauth/actions.scala b/...ain/scala/com/gu/googleauth/actions.scala → ...ain/scala/com/gu/googleauth/actions.scala
diff --git a/...c/main/scala/com/gu/googleauth/auth.scala → ...c/main/scala/com/gu/googleauth/auth.scala b/...c/main/scala/com/gu/googleauth/auth.scala → ...c/main/scala/com/gu/googleauth/auth.scala
diff --git a/...ain/scala/com/gu/googleauth/filters.scala → ...ain/scala/com/gu/googleauth/filters.scala b/...ain/scala/com/gu/googleauth/filters.scala → ...ain/scala/com/gu/googleauth/filters.scala
diff --git a/...main/scala/com/gu/googleauth/groups.scala → ...main/scala/com/gu/googleauth/groups.scala b/...main/scala/com/gu/googleauth/groups.scala → ...main/scala/com/gu/googleauth/groups.scala
diff --git a/...oogleauth/internal/DirectoryService.scala → ...oogleauth/internal/DirectoryService.scala b/...oogleauth/internal/DirectoryService.scala → ...oogleauth/internal/DirectoryService.scala
diff --git a/.../main/scala/com/gu/googleauth/model.scala → .../main/scala/com/gu/googleauth/model.scala b/.../main/scala/com/gu/googleauth/model.scala → .../main/scala/com/gu/googleauth/model.scala
diff --git a/...st/example/webapp/app/AppComponents.scala → ...st/example/webapp/app/AppComponents.scala b/...st/example/webapp/app/AppComponents.scala → ...st/example/webapp/app/AppComponents.scala
diff --git a/...t-test/example/webapp/app/AppLoader.scala → ...t-test/example/webapp/app/AppLoader.scala b/...t-test/example/webapp/app/AppLoader.scala → ...t-test/example/webapp/app/AppLoader.scala
diff --git a/.../webapp/app/controllers/Application.scala → .../webapp/app/controllers/Application.scala b/.../webapp/app/controllers/Application.scala → .../webapp/app/controllers/Application.scala
diff --git a/...xample/webapp/app/controllers/Login.scala → ...xample/webapp/app/controllers/Login.scala b/...xample/webapp/app/controllers/Login.scala → ...xample/webapp/app/controllers/Login.scala
diff --git a/...webapp/app/views/authenticated.scala.html → ...webapp/app/views/authenticated.scala.html b/...webapp/app/views/authenticated.scala.html → ...webapp/app/views/authenticated.scala.html
diff --git a/...example/webapp/app/views/index.scala.html → ...example/webapp/app/views/index.scala.html b/...example/webapp/app/views/index.scala.html → ...example/webapp/app/views/index.scala.html
diff --git a/...example/webapp/app/views/login.scala.html → ...example/webapp/app/views/login.scala.html b/...example/webapp/app/views/login.scala.html → ...example/webapp/app/views/login.scala.html
diff --git a/...v27/src/sbt-test/example/webapp/build.sbt → ...v28/src/sbt-test/example/webapp/build.sbt b/...v27/src/sbt-test/example/webapp/build.sbt → ...v28/src/sbt-test/example/webapp/build.sbt
diff --git a/...test/example/webapp/conf/application.conf → ...test/example/webapp/conf/application.conf b/...test/example/webapp/conf/application.conf → ...test/example/webapp/conf/application.conf
diff --git a/...7/src/sbt-test/example/webapp/conf/routes → ...8/src/sbt-test/example/webapp/conf/routes b/...7/src/sbt-test/example/webapp/conf/routes → ...8/src/sbt-test/example/webapp/conf/routes
diff --git a/...t/example/webapp/project/build.properties → ...t/example/webapp/project/build.properties b/...t/example/webapp/project/build.properties → ...t/example/webapp/project/build.properties
diff --git a/...t-test/example/webapp/project/plugins.sbt → ...t-test/example/webapp/project/plugins.sbt b/...t-test/example/webapp/project/plugins.sbt → ...t-test/example/webapp/project/plugins.sbt
diff --git a/play-v27/src/sbt-test/example/webapp/test → play-v28/src/sbt-test/example/webapp/test b/play-v27/src/sbt-test/example/webapp/test → play-v28/src/sbt-test/example/webapp/test
diff --git a/...7/src/sbt-test/example/webapp/version.sbt → ...8/src/sbt-test/example/webapp/version.sbt b/...7/src/sbt-test/example/webapp/version.sbt → ...8/src/sbt-test/example/webapp/version.sbt
diff --git a/...u/googleauth/AntiForgeryCheckerTest.scala → ...u/googleauth/AntiForgeryCheckerTest.scala b/...u/googleauth/AntiForgeryCheckerTest.scala → ...u/googleauth/AntiForgeryCheckerTest.scala
diff --git a/...la/com/gu/googleauth/GoogleAuthTest.scala → ...la/com/gu/googleauth/GoogleAuthTest.scala b/...la/com/gu/googleauth/GoogleAuthTest.scala → ...la/com/gu/googleauth/GoogleAuthTest.scala
diff --git a/...eauth/TwoFactorAuthCheckerCLITester.scala → ...eauth/TwoFactorAuthCheckerCLITester.scala b/...eauth/TwoFactorAuthCheckerCLITester.scala → ...eauth/TwoFactorAuthCheckerCLITester.scala
diff --git a/play-v29/src b/play-v29/src
@@ -1 +1 @@
-../play-v27/src
+../play-v28/src
diff --git a/play-v29/src-akka b/play-v29/src-akka
@@ -1 +1 @@
-../play-v27/src-akka
+../play-v28/src-akka
diff --git a/play-v30/src b/play-v30/src
@@ -1 +1 @@
-../play-v27/src
+../play-v28/src
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -31,9 +31,8 @@ object Dependencies {
   }
 
   object PlayVersion {
-    val V27 = PlayVersion("27", "com.typesafe.play", "2.7.9")
-    val V28 = PlayVersion("28", "com.typesafe.play", "2.8.20")
-    val V29 = PlayVersion("29", "com.typesafe.play", "2.9.0", supportsScala3 = true)
+    val V28 = PlayVersion("28", "com.typesafe.play", "2.8.21")
+    val V29 = PlayVersion("29", "com.typesafe.play", "2.9.2", supportsScala3 = true)
     val V30 = PlayVersion("30", "org.playframework", "3.0.2", supportsScala3 = true, usesPekko = true)
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ target/ @@
     .idea/
     *.log
     .bsp/
+    .DS_Store