Skip to content

Commit 4adead1

Browse files
committed
Play 3
1 parent 29a68b7 commit 4adead1

5 files changed

Lines changed: 28 additions & 38 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ webjars-file-service
33

44
Todo:
55
- Local Cache with fallback to remote cache with fallback to no cache
6-
-

build.sbt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@ libraryDependencies ++= Seq(
1010
filters,
1111
cacheApi,
1212

13-
// https://github.com/playframework/playframework/releases/2.8.15
14-
"com.google.inject" % "guice" % "5.1.0",
15-
"com.google.inject.extensions" % "guice-assistedinject" % "5.1.0",
16-
17-
"org.webjars" %% "webjars-play" % "2.9.1",
18-
"org.apache.commons" % "commons-io" % "1.3.2",
13+
"org.webjars" %% "webjars-play" % "3.0.1",
14+
"commons-io" % "commons-io" % "2.15.1",
1915
"com.github.mumoshu" %% "play2-memcached-play28" % "0.11.0",
2016
"org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test,
2117
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.0" % Test
2218
)
2319

24-
javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
20+
javacOptions ++= Seq("--release", "11")
2521

2622
Test / fork := true

conf/application.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ memcached.host=${?MEMCACHIER_SERVERS}
1414
memcached.user=${?MEMCACHIER_USERNAME}
1515
memcached.password=${?MEMCACHIER_PASSWORD}
1616

17-
akka {
17+
pekko {
1818
actor {
1919
default-dispatcher {
2020
fork-join-executor {

conf/logback.xml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
<!-- https://www.playframework.com/documentation/latest/SettingsLogger -->
2-
<configuration>
3-
4-
<conversionRule conversionWord="coloredLevel" converterClass="play.api.libs.logback.ColoredLevel" />
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE configuration>
53

6-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
7-
<encoder>
8-
<pattern>%coloredLevel %logger{15} - %message%n%xException{10}</pattern>
9-
</encoder>
10-
</appender>
11-
12-
<appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
13-
<appender-ref ref="STDOUT" />
14-
</appender>
4+
<configuration>
5+
<import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
6+
<import class="ch.qos.logback.classic.AsyncAppender"/>
7+
<import class="ch.qos.logback.core.ConsoleAppender"/>
158

16-
<logger name="play" level="INFO" />
17-
<logger name="application" level="DEBUG" />
9+
<appender name="STDOUT" class="ConsoleAppender">
10+
<encoder class="PatternLayoutEncoder">
11+
<pattern>%coloredLevel %logger{15} - %message%n%xException{10}</pattern>
12+
</encoder>
13+
</appender>
1814

19-
<!-- Off these ones as they are annoying, and anyway we manage configuration ourselves -->
20-
<logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF" />
21-
<logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF" />
22-
<logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF" />
23-
<logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF" />
15+
<appender name="ASYNCSTDOUT" class="AsyncAppender">
16+
<appender-ref ref="STDOUT"/>
17+
</appender>
2418

25-
<root level="WARN">
26-
<appender-ref ref="ASYNCSTDOUT" />
27-
</root>
19+
<logger name="play" level="INFO"/>
20+
<logger name="application" level="DEBUG"/>
21+
<logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF"/>
22+
<logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF"/>
23+
<logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF"/>
24+
<logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF"/>
2825

26+
<root level="WARN">
27+
<appender-ref ref="ASYNCSTDOUT"/>
28+
</root>
2929
</configuration>

project/plugins.sbt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
// The Play plugin
2-
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.1")
3-
4-
// https://github.com/sbt/sbt/issues/7007
5-
ThisBuild / libraryDependencySchemes ++= Seq(
6-
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
7-
)
2+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")

0 commit comments

Comments
 (0)