From 58ec642e3c56e770eb39ef177fc2591a066b10be Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 7 Mar 2023 17:38:35 +0100 Subject: [PATCH] Explicit main method needed for Scala 3 --- .../app/utils/JavaScriptRouterGenerator.scala | 49 +++++++++-------- .../app/utils/JavaScriptRouterGenerator.scala | 53 ++++++++++--------- .../app/utils/JavaScriptRouterGenerator.scala | 35 ++++++------ .../app/utils/JavaScriptRouterGenerator.scala | 51 +++++++++--------- .../app/utils/JavaScriptRouterGenerator.scala | 50 ++++++++--------- 5 files changed, 126 insertions(+), 112 deletions(-) diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/app/utils/JavaScriptRouterGenerator.scala b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/app/utils/JavaScriptRouterGenerator.scala index c5d2e482a86..81617d184e2 100644 --- a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/app/utils/JavaScriptRouterGenerator.scala +++ b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/app/utils/JavaScriptRouterGenerator.scala @@ -7,33 +7,36 @@ package utils import java.nio.file.Paths import java.nio.file.Files -object JavaScriptRouterGenerator extends App { +object JavaScriptRouterGenerator { import controllers.routes.javascript._ - val host = if (args.length > 1) args(1) else "localhost" - - val jsFile = play.api.routing - .JavaScriptReverseRouter( - "jsRoutes", - None, - host, - Application.index, - Application.post, - Application.withParam, - Application.takeBool, - Application.takeList - ) - .body - - // Add module exports for node - val jsModule = jsFile + - """ - |module.exports = jsRoutes + def main(args: Array[String]): Unit = { + val host = if (args.length > 1) args(1) else "localhost" + + val jsFile = play.api.routing + .JavaScriptReverseRouter( + "jsRoutes", + None, + host, + Application.index, + Application.post, + Application.withParam, + Application.takeBool, + Application.takeList + ) + .body + + // Add module exports for node + val jsModule = jsFile + + """ + |module.exports = jsRoutes """.stripMargin - val path = Paths.get(args(0)) - Files.createDirectories(path.getParent) - Files.write(path, jsModule.getBytes("UTF-8")) + val path = Paths.get(args(0)) + Files.createDirectories(path.getParent) + Files.write(path, jsModule.getBytes("UTF-8")) + () + } } diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/app/utils/JavaScriptRouterGenerator.scala b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/app/utils/JavaScriptRouterGenerator.scala index d010b3cb969..27842792b8b 100644 --- a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/app/utils/JavaScriptRouterGenerator.scala +++ b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/app/utils/JavaScriptRouterGenerator.scala @@ -7,35 +7,38 @@ package utils import java.nio.file.Paths import java.nio.file.Files -object JavaScriptRouterGenerator extends App { +object JavaScriptRouterGenerator { import controllers.routes.javascript._ - val host = if (args.length > 1) args(1) else "localhost" - - val jsFile = play.api.routing - .JavaScriptReverseRouter( - "jsRoutes", - None, - host, - Assets.versioned, - Application.index, - Application.post, - Application.withParam, - Application.takeBool, - Application.takeListTickedParam, - Application.takeTickedParams - ) - .body - - // Add module exports for node - val jsModule = jsFile + - """ - |module.exports = jsRoutes + def main(args: Array[String]): Unit = { + val host = if (args.length > 1) args(1) else "localhost" + + val jsFile = play.api.routing + .JavaScriptReverseRouter( + "jsRoutes", + None, + host, + Assets.versioned, + Application.index, + Application.post, + Application.withParam, + Application.takeBool, + Application.takeListTickedParam, + Application.takeTickedParams + ) + .body + + // Add module exports for node + val jsModule = jsFile + + """ + |module.exports = jsRoutes """.stripMargin - val path = Paths.get(args(0)) - Files.createDirectories(path.getParent) - Files.write(path, jsModule.getBytes("UTF-8")) + val path = Paths.get(args(0)) + Files.createDirectories(path.getParent) + Files.write(path, jsModule.getBytes("UTF-8")) + () + } } diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-namespace-reverse-router/app/utils/JavaScriptRouterGenerator.scala b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-namespace-reverse-router/app/utils/JavaScriptRouterGenerator.scala index 9b9bd624198..db28fec5c69 100644 --- a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-namespace-reverse-router/app/utils/JavaScriptRouterGenerator.scala +++ b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-namespace-reverse-router/app/utils/JavaScriptRouterGenerator.scala @@ -7,25 +7,28 @@ package utils import java.nio.file.Files import java.nio.file.Paths -object JavaScriptRouterGenerator extends App { +object JavaScriptRouterGenerator { - val jsFile = play.api.routing - .JavaScriptReverseRouter( - "jsRoutes", - None, - "localhost", - router.controllers.routes.javascript.Assets.versioned, - ) - .body + def main(args: Array[String]): Unit = { + val jsFile = play.api.routing + .JavaScriptReverseRouter( + "jsRoutes", + None, + "localhost", + router.controllers.routes.javascript.Assets.versioned, + ) + .body - // Add module exports for node - val jsModule = jsFile + - """ - |module.exports = jsRoutes + // Add module exports for node + val jsModule = jsFile + + """ + |module.exports = jsRoutes """.stripMargin - val path = Paths.get(args(0)) - Files.createDirectories(path.getParent) - Files.write(path, jsModule.getBytes("UTF-8")) + val path = Paths.get(args(0)) + Files.createDirectories(path.getParent) + Files.write(path, jsModule.getBytes("UTF-8")) + () + } } diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/app/utils/JavaScriptRouterGenerator.scala b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/app/utils/JavaScriptRouterGenerator.scala index 20d16dfef22..6680f326c6f 100644 --- a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/app/utils/JavaScriptRouterGenerator.scala +++ b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/app/utils/JavaScriptRouterGenerator.scala @@ -7,34 +7,37 @@ package utils import java.nio.file.Paths import java.nio.file.Files -object JavaScriptRouterGenerator extends App { +object JavaScriptRouterGenerator { import router.routes.javascript._ - val host = if (args.length > 1) args(1) else "localhost" - - val jsFile = play.api.routing - .JavaScriptReverseRouter( - "jsRoutes", - None, - host, - Application.index, - Application.post, - Application.withParam, - Application.takeBool, - Application.takeListTickedParam, - Application.takeTickedParams - ) - .body - - // Add module exports for node - val jsModule = jsFile + - """ - |module.exports = jsRoutes + def main(args: Array[String]): Unit = { + val host = if (args.length > 1) args(1) else "localhost" + + val jsFile = play.api.routing + .JavaScriptReverseRouter( + "jsRoutes", + None, + host, + Application.index, + Application.post, + Application.withParam, + Application.takeBool, + Application.takeListTickedParam, + Application.takeTickedParams + ) + .body + + // Add module exports for node + val jsModule = jsFile + + """ + |module.exports = jsRoutes """.stripMargin - val path = Paths.get(args(0)) - Files.createDirectories(path.getParent) - Files.write(path, jsModule.getBytes("UTF-8")) + val path = Paths.get(args(0)) + Files.createDirectories(path.getParent) + Files.write(path, jsModule.getBytes("UTF-8")) + () + } } diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/app/utils/JavaScriptRouterGenerator.scala b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/app/utils/JavaScriptRouterGenerator.scala index 064e017eb7e..a4ec0cee2ba 100644 --- a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/app/utils/JavaScriptRouterGenerator.scala +++ b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/app/utils/JavaScriptRouterGenerator.scala @@ -7,33 +7,35 @@ package utils import java.nio.file.Files import java.nio.file.Paths -object JavaScriptRouterGenerator extends App { +object JavaScriptRouterGenerator { import controllers.routes.javascript._ - val jsFile = play.api.routing - .JavaScriptReverseRouter( - "jsRoutes", - None, - "localhost", - Assets.versioned, - Application.index, - Application.post, - Application.withParam, - Application.takeBool, - Application.takeOptionalInt, - Application.takeOptionalIntWithDefault - ) - .body - - // Add module exports for node - val jsModule = jsFile + - """ - |module.exports = jsRoutes + def main(args: Array[String]): Unit = { + val jsFile = play.api.routing + .JavaScriptReverseRouter( + "jsRoutes", + None, + "localhost", + Assets.versioned, + Application.index, + Application.post, + Application.withParam, + Application.takeBool, + Application.takeOptionalInt, + Application.takeOptionalIntWithDefault + ) + .body + + // Add module exports for node + val jsModule = jsFile + + """ + |module.exports = jsRoutes """.stripMargin - val path = Paths.get(args(0)) - Files.createDirectories(path.getParent) - Files.write(path, jsModule.getBytes("UTF-8")) - + val path = Paths.get(args(0)) + Files.createDirectories(path.getParent) + Files.write(path, jsModule.getBytes("UTF-8")) + () + } }