Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explicit main method needed for Scala 3 #11701

Merged
merged 1 commit into from
Mar 7, 2023
Merged

Explicit main method needed for Scala 3 #11701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 26 additions & 23 deletions ...injected-routes-compilation-with-request-passed/app/utils/JavaScriptRouterGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

() was added because of the -Wvalue-discard flag that was added to the scala 3 flags in #11700 as equivalent to -Ywarn-value-discard that already existed for Scala 2.

}

}
53 changes: 28 additions & 25 deletions ...gin/routes-compiler-injected-routes-compilation/app/utils/JavaScriptRouterGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
()
}

}
35 changes: 19 additions & 16 deletions ...plugin/routes-compiler-namespace-reverse-router/app/utils/JavaScriptRouterGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
()
}

}
51 changes: 27 additions & 24 deletions ...-compiler-no-package-declaration-in-routes-file/app/utils/JavaScriptRouterGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
()
}

}
50 changes: 26 additions & 24 deletions ...y-sbt-plugin/routes-compiler-routes-compilation/app/utils/JavaScriptRouterGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
()
}
}