From 8e81111668a827e6941c49ae2084017aeb0d2e76 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Mon, 15 Jan 2024 23:07:12 +0100
Subject: [PATCH 1/2] Dependency updates

---
 build.sbt                | 6 +++---
 project/build.properties | 2 +-
 project/plugins.sbt      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index 3cb1478..2587cda 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,11 +14,11 @@ libraryDependencies ++= Seq(
   "com.google.inject" % "guice" % "5.1.0",
   "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0",
 
-  "org.webjars" %% "webjars-play" % "2.8.18",
+  "org.webjars" %% "webjars-play" % "2.9.1",
   "org.apache.commons" % "commons-io" % "1.3.2",
   "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")
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..d8e997a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.21")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.1")
 
 // https://github.com/sbt/sbt/issues/7007
 ThisBuild / libraryDependencySchemes ++= Seq(

From 718b018ecbcdef810543654edfd18216ca5db4df Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Mon, 15 Jan 2024 23:19:04 +0100
Subject: [PATCH 2/2] Play 3

---
 README.md             |  1 -
 build.sbt             | 10 +++-------
 conf/application.conf |  2 +-
 conf/logback.xml      | 46 +++++++++++++++++++++----------------------
 project/plugins.sbt   |  7 +------
 5 files changed, 28 insertions(+), 38 deletions(-)

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 2587cda..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.9.1",
-  "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" % "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 @@
-<!-- https://www.playframework.com/documentation/latest/SettingsLogger -->
-<configuration>
-
-    <conversionRule conversionWord="coloredLevel" converterClass="play.api.libs.logback.ColoredLevel" />
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration>
 
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%coloredLevel %logger{15} - %message%n%xException{10}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="STDOUT" />
-    </appender>
+<configuration>
+  <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
+  <import class="ch.qos.logback.classic.AsyncAppender"/>
+  <import class="ch.qos.logback.core.ConsoleAppender"/>
 
-    <logger name="play" level="INFO" />
-    <logger name="application" level="DEBUG" />
+  <appender name="STDOUT" class="ConsoleAppender">
+    <encoder class="PatternLayoutEncoder">
+      <pattern>%coloredLevel %logger{15} - %message%n%xException{10}</pattern>
+    </encoder>
+  </appender>
 
-    <!-- Off these ones as they are annoying, and anyway we manage configuration ourselves -->
-    <logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF" />
-    <logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF" />
-    <logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF" />
-    <logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF" />
+  <appender name="ASYNCSTDOUT" class="AsyncAppender">
+    <appender-ref ref="STDOUT"/>
+  </appender>
 
-    <root level="WARN">
-        <appender-ref ref="ASYNCSTDOUT" />
-    </root>
+  <logger name="play" level="INFO"/>
+  <logger name="application" level="DEBUG"/>
+  <logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF"/>
+  <logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF"/>
+  <logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF"/>
+  <logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF"/>
 
+  <root level="WARN">
+    <appender-ref ref="ASYNCSTDOUT"/>
+  </root>
 </configuration>
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d8e997a..184612a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.1")
-
-// 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")