diff --git a/.gitignore b/.gitignore index ae671cc..1d43a64 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ target/ node_modules .DS_Store .metals -.vscode \ No newline at end of file +.vscode +.bsp/ diff --git a/app/lib/PanAuth.scala b/app/lib/PanAuth.scala index 7cbb61c..fb0672f 100644 --- a/app/lib/PanAuth.scala +++ b/app/lib/PanAuth.scala @@ -2,10 +2,11 @@ package lib import com.gu.pandomainauth.model.{Authenticated, AuthenticatedUser, AuthenticationStatus, User} -import com.gu.pandomainauth.{PanDomain, PublicKey, PublicSettings} +import com.gu.pandomainauth.{PanDomain, PublicSettings} import play.api.Logging import play.api.mvc._ +import java.security.PublicKey import scala.concurrent.{ExecutionContext, Future} class UserRequest[A](val user: User, request: Request[A]) extends WrappedRequest[A](request) diff --git a/build.sbt b/build.sbt index 05e02a2..551c06f 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ import PlayKeys._ name := "s3-uploader" version := "1.0" -scalaVersion := "2.13.10" +scalaVersion := "2.13.14" scalacOptions := Seq( "-unchecked", @@ -14,7 +14,7 @@ scalacOptions := Seq( libraryDependencies ++= Seq( ws, filters, "com.amazonaws" % "aws-java-sdk-s3" % "1.12.761", - "com.gu" %% "pan-domain-auth-verification" % "4.0.0" + "com.gu" %% "pan-domain-auth-verification" % "5.0.0" ) lazy val root = (project in file(".")) diff --git a/project/build.properties b/project/build.properties index 2743082..ee4c672 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.6 +sbt.version=1.10.1