From 7965bed85ba78ce6570836d28dc5253bf428bf76 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Tue, 8 Oct 2024 06:56:45 +0900 Subject: [PATCH] avoid deprecated scala.App. add explicit main --- launcher/src/main/scala/LauncherMain.scala | 8 +++++--- .../src/main/scala/com/example/Main.scala | 6 ++++-- .../src/main/g8/src/main/scala/$package$/Main.scala | 6 ++++-- plugin/src/sbt-test/giter8/root-layout/Main.scala | 6 ++++-- .../giter8/simple/src/main/g8/src/main/scala/Main.scala | 6 ++++-- .../src/main/g8/src/main/scala/$package$/Main.scala | 6 ++++-- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/launcher/src/main/scala/LauncherMain.scala b/launcher/src/main/scala/LauncherMain.scala index 6f734824..ca609279 100644 --- a/launcher/src/main/scala/LauncherMain.scala +++ b/launcher/src/main/scala/LauncherMain.scala @@ -6,10 +6,12 @@ import java.util.Properties import java.lang.reflect.InvocationTargetException import java.nio.file.{Files, StandardCopyOption} -object LauncherMain extends Runner with App { - java.util.logging.Logger.getLogger("").setLevel(java.util.logging.Level.SEVERE) +object LauncherMain extends Runner { + def main(args: Array[String]): Unit = { + java.util.logging.Logger.getLogger("").setLevel(java.util.logging.Level.SEVERE) - System.exit(run(args, new LauncherProcessor)) + System.exit(run(args, new LauncherProcessor)) + } } class LauncherProcessor extends Processor { diff --git a/library/src/test/resources/testcases/simple-sbt-project/output/example-sbt-project/src/main/scala/com/example/Main.scala b/library/src/test/resources/testcases/simple-sbt-project/output/example-sbt-project/src/main/scala/com/example/Main.scala index b25ee610..7d9d09de 100644 --- a/library/src/test/resources/testcases/simple-sbt-project/output/example-sbt-project/src/main/scala/com/example/Main.scala +++ b/library/src/test/resources/testcases/simple-sbt-project/output/example-sbt-project/src/main/scala/com/example/Main.scala @@ -1,5 +1,7 @@ package com.example -object Main extends App { - println("Hello from project Example SBT project") +object Main { + def main(args: Array[String]): Unit = { + println("Hello from project Example SBT project") + } } diff --git a/library/src/test/resources/testcases/simple-sbt-project/template/src/main/g8/src/main/scala/$package$/Main.scala b/library/src/test/resources/testcases/simple-sbt-project/template/src/main/g8/src/main/scala/$package$/Main.scala index 4787fec6..89a2f073 100644 --- a/library/src/test/resources/testcases/simple-sbt-project/template/src/main/g8/src/main/scala/$package$/Main.scala +++ b/library/src/test/resources/testcases/simple-sbt-project/template/src/main/g8/src/main/scala/$package$/Main.scala @@ -1,5 +1,7 @@ package $package$ -object Main extends App { - println("Hello from project $name$") +object Main { + def main(args: Array[String]): Unit = { + println("Hello from project $name$") + } } diff --git a/plugin/src/sbt-test/giter8/root-layout/Main.scala b/plugin/src/sbt-test/giter8/root-layout/Main.scala index da819c9a..8438cccf 100644 --- a/plugin/src/sbt-test/giter8/root-layout/Main.scala +++ b/plugin/src/sbt-test/giter8/root-layout/Main.scala @@ -17,6 +17,8 @@ package $package$ -object Main extends App { - println("hello") +object Main { + def main(args: Array[String]): Unit = { + println("hello") + } } diff --git a/plugin/src/sbt-test/giter8/simple/src/main/g8/src/main/scala/Main.scala b/plugin/src/sbt-test/giter8/simple/src/main/g8/src/main/scala/Main.scala index ae104a84..2b6a51e7 100644 --- a/plugin/src/sbt-test/giter8/simple/src/main/g8/src/main/scala/Main.scala +++ b/plugin/src/sbt-test/giter8/simple/src/main/g8/src/main/scala/Main.scala @@ -15,6 +15,8 @@ * limitations under the License. */ -object Main extends App { - println("hello") +object Main { + def main(args: Array[String]): Unit = { + println("hello") + } } diff --git a/plugin/src/sbt-test/giter8/without-name/src/main/g8/src/main/scala/$package$/Main.scala b/plugin/src/sbt-test/giter8/without-name/src/main/g8/src/main/scala/$package$/Main.scala index 4d5bb1f3..2f5ca550 100644 --- a/plugin/src/sbt-test/giter8/without-name/src/main/g8/src/main/scala/$package$/Main.scala +++ b/plugin/src/sbt-test/giter8/without-name/src/main/g8/src/main/scala/$package$/Main.scala @@ -1,5 +1,7 @@ package $package$ -object Main extends App { - println("Hello from project without name") +object Main { + def main(args: Array[String]): Unit = { + println("Hello from project without name") + } }