Merge pull request #1243 from lefou/deprecated-main

Re-added but deprecated old Main entry point
com-lihaoyi · Jan 13, 2022 · b0470ac · b0470ac
2 parents 01d7b78 + 106f9a3
commit b0470ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/amm/src/main/scala/ammonite/AmmoniteMain.scala b/amm/src/main/scala/ammonite/AmmoniteMain.scala
@@ -20,7 +20,8 @@ import coursierapi.Dependency
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
 
-
+// needed to support deprecated Main.main
+import acyclic.skipped
 
 object AmmoniteMain{
 

diff --git a/amm/src/main/scala/ammonite/Main.scala b/amm/src/main/scala/ammonite/Main.scala
@@ -20,6 +20,8 @@ import coursierapi.Dependency
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
 
+// needed to support deprecated Main.main
+import acyclic.skipped
 
 
 /**
@@ -266,3 +268,7 @@ case class Main(predefCode: String = "",
   }
 }
 
+object Main {
+  @deprecated("Use ammonite.AmmoniteMain.main instead", "2.5.0")
+  def main(args: Array[String]): Unit = AmmoniteMain.main(args)
+}
diff --git a/amm/src/main/scala/ammonite/MainRunner.scala b/amm/src/main/scala/ammonite/MainRunner.scala
@@ -18,6 +18,8 @@ import scala.annotation.tailrec
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
 
+// needed to support deprecated Main.main
+import acyclic.skipped
 
 /**
   * Bundles together: