Skip to content

Commit 08663f1

Browse files
Merge pull request #2 from lichess-org/fix-warnings/0
Fix more compilation warnings
2 parents 1eb8412 + 230b1f6 commit 08663f1

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

build.sbt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ lazy val PlayProject = Project("Play", file("core/play"))
3838
scalaVersion.value
3939
) ++ scalacheckDependencies ++ cookieEncodingDependencies :+
4040
jimfs % Test,
41-
(sourceGenerators in Compile) += Def
41+
(Compile / sourceGenerators) += Def
4242
.task(
4343
PlayVersion(
4444
version.value,
4545
scalaVersion.value,
4646
sbtVersion.value,
4747
Dependencies.akkaVersion,
4848
Dependencies.akkaHttpVersion,
49-
(sourceManaged in Compile).value
49+
(Compile / sourceManaged).value
5050
)
5151
)
5252
.taskValue
@@ -67,9 +67,8 @@ lazy val PlayLogback = Project("Play-Logback", file("core/play-logback"))
6767
.settings(playCommonSettings)
6868
.settings(
6969
libraryDependencies += logback,
70-
parallelExecution in Test := false,
71-
// quieten deprecation warnings in tests
72-
scalacOptions in Test := (scalacOptions in Test).value.diff(Seq("-deprecation"))
70+
Test / parallelExecution := false,
71+
Test / scalacOptions := (Test / scalacOptions).value.diff(Seq("-deprecation"))
7372
)
7473
.dependsOn(PlayProject)
7574

@@ -78,8 +77,7 @@ lazy val PlayConfiguration = Project("Play-Configuration", file("core/play-confi
7877
.settings(
7978
libraryDependencies ++= Seq(typesafeConfig, slf4jApi) ++ specs2Deps.map(_ % Test),
8079
(Test / parallelExecution) := false,
81-
// quieten deprecation warnings in tests
82-
(scalacOptions in Test) := (scalacOptions in Test).value.diff(Seq("-deprecation"))
80+
(Test / scalacOptions) := (Test / scalacOptions).value.diff(Seq("-deprecation"))
8381
)
8482
.dependsOn(PlayExceptionsProject)
8583

dev-mode/routes-compiler/src/main/scala/play/routes/compiler/RoutesCompiler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import java.nio.charset.Charset
99
import java.nio.charset.MalformedInputException
1010
import java.nio.file.Files
1111

12-
import scala.collection.JavaConverters.*
12+
import scala.jdk.CollectionConverters.*
1313

1414
import scala.io.Codec
1515

dev-mode/routes-compiler/src/main/scala/play/routes/compiler/RoutesFileParser.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ object RoutesFileParser:
4545
validate(routesFile, parsed.collect { case r: Route => r }) match
4646
case Nil => Right(parsed)
4747
case errors => Left(errors)
48-
case parser.NoSuccess(message, in) =>
48+
case parser.Error(message, in) =>
49+
Left(Seq(RoutesCompilationError(routesFile, message, Some(in.pos.line), Some(in.pos.column))))
50+
case parser.Failure(message, in) =>
4951
Left(Seq(RoutesCompilationError(routesFile, message, Some(in.pos.line), Some(in.pos.column))))
5052

5153
/**

dev-mode/routes-compiler/src/main/twirl/play/routes/compiler/static/reverseRouter.scala.twirl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import play.core.routing.{dynamicString}
1010
@for(i <- imports) {
1111
import @if(!i.startsWith("_root_.")){_root_.}@i}
1212

13-
@markLines(routes: _*)
13+
@markLines(routes*)
1414
package routes @ob
1515

1616
@for((controller, routes) <- groupRoutesByController(routes)) {
17-
@markLines(routes: _*)
17+
@markLines(routes*)
1818
object @(controller.replace(".", "_")) @ob
1919

2020
@for(((method, _), routes) <- groupRoutesByMethod(routes)) {@routes match {
@@ -26,7 +26,7 @@ package routes @ob
2626
@cb
2727
}
2828
case _ => {
29-
@markLines(routes: _*)
29+
@markLines(routes*)
3030
def @(method)@(reverseSignature(routes)): Call = @ob
3131
@defining(reverseParameters(routes)) { params =>
3232
(@reverseMatchParameters(params, true)) match @ob

0 commit comments

Comments
 (0)