Drop support for Play v2.8

Play 2.8 is End Of Life (EOL) on 31st May 2024. This library (`play-googleauth`) depends on `play-secret-rotation`, which dropped support for Play v2.8 with guardian/play-secret-rotation#462. Previous `play-googleauth` PR dropping support for Play v2.7: #221
guardian · May 24, 2024 · 24d715a · 24d715a
1 parent 74583ab
commit 24d715a
Show file tree

Hide file tree

Showing 31 changed files with 5 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -14,12 +14,12 @@ val artifactPomMetadataSettings = Seq(
 
 def projectWithPlayVersion(playVersion: PlayVersion) =
   Project(playVersion.projectId, file(playVersion.projectId)).settings(
-    crossScalaVersions := Seq(scalaVersion.value) ++ (if (playVersion.supportsScala3) Seq("3.3.3") else Seq.empty),
+    crossScalaVersions := Seq(scalaVersion.value, "3.3.3"),
     scalacOptions ++= Seq("-feature", "-deprecation", "-release","11"),
     Compile / unmanagedSourceDirectories += baseDirectory.value / playVersion.pekkoOrAkkaSrcFolder,
 
     libraryDependencies ++= Seq(
-      "com.gu.play-secret-rotation" %% "core" % "8.2.1",
+      "com.gu.play-secret-rotation" %% "core" % "8.3.1",
       "org.typelevel" %% "cats-core" % "2.10.0",
       commonsCodec,
       "org.scalatest" %% "scalatest" % "3.2.18" % Test,
@@ -29,12 +29,10 @@ def projectWithPlayVersion(playVersion: PlayVersion) =
     artifactPomMetadataSettings
   )
 
-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-v28`,
   `play-v29`,
   `play-v30`
 ).settings(

diff --git a/play-v29/src b/play-v29/src
diff --git a/play-v29/src-akka b/play-v29/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/...v28/src/sbt-test/example/webapp/build.sbt → ...v29/src/sbt-test/example/webapp/build.sbt b/...v28/src/sbt-test/example/webapp/build.sbt → ...v29/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/...8/src/sbt-test/example/webapp/conf/routes → ...9/src/sbt-test/example/webapp/conf/routes b/...8/src/sbt-test/example/webapp/conf/routes → ...9/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-v28/src/sbt-test/example/webapp/test → play-v29/src/sbt-test/example/webapp/test b/play-v28/src/sbt-test/example/webapp/test → play-v29/src/sbt-test/example/webapp/test
diff --git a/...8/src/sbt-test/example/webapp/version.sbt → ...9/src/sbt-test/example/webapp/version.sbt b/...8/src/sbt-test/example/webapp/version.sbt → ...9/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-v30/src b/play-v30/src
@@ -1 +1 @@
-../play-v28/src
+../play-v29/src
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -13,7 +13,6 @@ object Dependencies {
     majorMinorVersion: String,
     groupId: String,
     exactPlayVersion: String,
-    supportsScala3: Boolean = false,
     usesPekko: Boolean = false
   ) {
     val projectId = s"play-v$majorMinorVersion"
@@ -31,9 +30,8 @@ object Dependencies {
   }
 
   object PlayVersion {
-    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)
+    val V29 = PlayVersion("29", "com.typesafe.play", "2.9.2")
+    val V30 = PlayVersion("30", "org.playframework", "3.0.2", usesPekko = true)
   }
 
   val commonsCodec = "commons-codec" % "commons-codec" % "1.17.0"