diff --git a/README.md b/README.md index 6f0141a..a755ea0 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,3 @@ webjars-file-service Todo: - Local Cache with fallback to remote cache with fallback to no cache -- diff --git a/build.sbt b/build.sbt index 3cb1478..e1c6dac 100644 --- a/build.sbt +++ b/build.sbt @@ -10,17 +10,13 @@ libraryDependencies ++= Seq( filters, cacheApi, - // https://github.com/playframework/playframework/releases/2.8.15 - "com.google.inject" % "guice" % "5.1.0", - "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0", - - "org.webjars" %% "webjars-play" % "2.8.18", - "org.apache.commons" % "commons-io" % "1.3.2", + "org.webjars" %% "webjars-play" % "3.0.1", + "commons-io" % "commons-io" % "2.15.1", "com.github.mumoshu" %% "play2-memcached-play28" % "0.11.0", - "org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test, - "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.17" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test, + "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.0" % Test ) -javacOptions ++= Seq("-source", "1.8", "-target", "1.8") +javacOptions ++= Seq("--release", "11") Test / fork := true diff --git a/conf/application.conf b/conf/application.conf index 06f5eea..a815630 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -14,7 +14,7 @@ memcached.host=${?MEMCACHIER_SERVERS} memcached.user=${?MEMCACHIER_USERNAME} memcached.password=${?MEMCACHIER_PASSWORD} -akka { +pekko { actor { default-dispatcher { fork-join-executor { diff --git a/conf/logback.xml b/conf/logback.xml index 6bc87da..0fb4ebb 100644 --- a/conf/logback.xml +++ b/conf/logback.xml @@ -1,29 +1,29 @@ - - - - + + - - - %coloredLevel %logger{15} - %message%n%xException{10} - - - - - - + + + + - - + + + %coloredLevel %logger{15} - %message%n%xException{10} + + - - - - - + + + - - - + + + + + + + + + diff --git a/project/build.properties b/project/build.properties index e8a1e24..abbbce5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index da3f88b..184612a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.21") - -// https://github.com/sbt/sbt/issues/7007 -ThisBuild / libraryDependencySchemes ++= Seq( - "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always -) +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")