Remove pretty stacktraces (#954)

Author: lwronski

build.sc

@@ -349,11 +349,6 @@ class Core(val crossScalaVersion: String) extends BuildLikeModule {
     val runnerMainClass = runner(Scala.defaultInternal)
       .mainClass()
       .getOrElse(sys.error("No main class defined for runner"))
-    val runnerNeedsSonatypeSnapshots =
-      if (Deps.prettyStacktraces.dep.version.endsWith("SNAPSHOT"))
-        """ !sv.startsWith("2.") """
-      else
-        "false"
     val detailedVersionValue =
       if (`local-repo`.developingOnStubModules) s"""Some("${vcsState()}")"""
       else "None"
@@ -387,8 +382,6 @@ class Core(val crossScalaVersion: String) extends BuildLikeModule {
          |  def runnerModuleName = "${runner(Scala.defaultInternal).artifactName()}"
          |  def runnerVersion = "${runner(Scala.defaultInternal).publishVersion()}"
          |  def runnerMainClass = "$runnerMainClass"
-         |  def runnerNeedsSonatypeSnapshots(sv: String): Boolean =
-         |    $runnerNeedsSonatypeSnapshots
          |
          |  def semanticDbPluginOrganization = "${Deps.scalametaTrees.dep.module.organization.value}"
          |  def semanticDbPluginModuleName = "semanticdb-scalac"
@@ -851,21 +844,6 @@ class Runner(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
 
   }
   def mainClass = Some("scala.cli.runner.Runner")
-  def ivyDeps =
-    if (crossScalaVersion.startsWith("3.") && !crossScalaVersion.contains("-RC"))
-      Agg(Deps.prettyStacktraces)
-    else
-      Agg.empty[Dep]
-  def repositories = {
-    val base = super.repositories
-    val extra =
-      if (Deps.prettyStacktraces.dep.version.endsWith("SNAPSHOT"))
-        Seq(coursier.Repositories.sonatype("snapshots"))
-      else
-        Nil
-
-    base ++ extra
-  }
   def sources = T.sources {
     val scala3DirNames =
       if (crossScalaVersion.startsWith("3.")) {

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

@@ -516,7 +516,7 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
       val exceptionLines =
         output.map(stripAnsi).dropWhile(!_.startsWith("Exception in thread "))
       val tab = "\t"
-      val sp  = " "
+
       val expectedLines =
         if (actualScalaVersion.startsWith("2.12."))
           s"""Exception in thread "main" java.lang.Exception: Caught exception during processing
@@ -528,7 +528,7 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
              |${tab}at Throws$$.main(Throws.scala:5)
              |$tab... 1 more
              |""".stripMargin.linesIterator.toVector
-        else if (actualScalaVersion.startsWith("2.13."))
+        else if (actualScalaVersion.startsWith("3.") || actualScalaVersion.startsWith("2.13."))
           s"""Exception in thread "main" java.lang.Exception: Caught exception during processing
              |${tab}at Throws$$.main(Throws.scala:8)
              |${tab}at Throws.main(Throws.scala)
@@ -538,16 +538,6 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
              |${tab}at Throws$$.main(Throws.scala:5)
              |$tab... 1 more
              |""".stripMargin.linesIterator.toVector
-        else if (actualScalaVersion.startsWith("3."))
-          s"""Exception in thread main: java.lang.Exception: Caught exception during processing
-             |    at method main in Throws.scala:8$sp
-             |
-             |Caused by: Exception in thread main: java.lang.RuntimeException: nope
-             |    at method error in scala.sys.package$$:27$sp
-             |    at method something in Throws.scala:3$sp
-             |    at method main in Throws.scala:5$sp
-             |
-             |""".stripMargin.linesIterator.toVector
         else
           sys.error(s"Unexpected Scala version: $actualScalaVersion")
       if (exceptionLines != expectedLines) {
@@ -649,9 +639,7 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
     inputs.fromRoot { root =>
       // format: off
       val cmd = Seq[os.Shellable](
-        TestUtil.cli, "run", extraOptions, ".",
-        "--java-prop=scala.cli.runner.Stacktrace.disable=true"
-      )
+        TestUtil.cli, "run", extraOptions, ".")
       // format: on
       val res    = os.proc(cmd).call(cwd = root, check = false, mergeErrIntoOut = true)
       val output = res.out.lines()

modules/options/src/main/scala/scala/build/Artifacts.scala

@@ -18,7 +18,6 @@ import scala.build.errors.{
   FetchingDependenciesError,
   RepositoryFormatError
 }
-import scala.build.internal.Constants
 import scala.build.internal.Constants.*
 import scala.build.internal.CsLoggerUtil.*
 import scala.build.internal.Util.PositionedScalaDependencyOps
@@ -108,11 +107,8 @@ object Artifacts {
       val hasSnapshots = (jvmRunnerDependencies ++ jvmTestRunnerDependencies)
         .exists(_.version.endsWith("SNAPSHOT")) ||
         scalaArtifactsParamsOpt.flatMap(_.scalaNativeCliVersion).exists(_.endsWith("SNAPSHOT"))
-      val runnerNeedsSonatypeSnapshots = Constants.runnerNeedsSonatypeSnapshots(
-        scalaArtifactsParamsOpt.fold("")(_.params.scalaVersion)
-      )
       val stubsNeedSonatypeSnapshots = addStubs && stubsVersion.endsWith("SNAPSHOT")
-      if (hasSnapshots || runnerNeedsSonatypeSnapshots || stubsNeedSonatypeSnapshots)
+      if (hasSnapshots || stubsNeedSonatypeSnapshots)
         Seq(coursier.Repositories.sonatype("snapshots").root)
       else
         Nil

modules/runner/src/main/scala-2/scala/cli/runner/Stacktrace.scala

@@ -49,10 +49,8 @@ final case class StackTracePrinter(
   ): Unit =
     if (ex != null) {
       truncateStackTrace(ex)
-      if (!Stacktrace.print(ex, "Caused by: ", verbosity)) {
-        System.err.println(s"Caused by: $ex")
-        printStackTrace(ex.getStackTrace, causedStackTrace)
-      }
+      System.err.println(s"Caused by: $ex")
+      printStackTrace(ex.getStackTrace, causedStackTrace)
       printCause(ex.getCause, ex.getStackTrace, verbosity)
     }
   private def printStackTrace(trace: Array[StackTraceElement]): Unit =
@@ -92,10 +90,8 @@ final case class StackTracePrinter(
     val q          = "\""
     val threadName = Thread.currentThread().getName
     truncateStackTrace(ex)
-    if (!Stacktrace.print(ex, "", verbosity)) {
-      System.err.println(s"Exception in thread $q$threadName$q $ex")
-      printStackTrace(ex.getStackTrace)
-    }
+    System.err.println(s"Exception in thread $q$threadName$q $ex")
+    printStackTrace(ex.getStackTrace)
     printCause(ex.getCause, ex.getStackTrace, verbosity)
   }
 }

modules/runner/src/main/scala-3-stable/scala/cli/runner/ClasspathDirectoriesLoader.scala

@@ -92,7 +92,6 @@ object Deps {
   def organizeImports            = ivy"com.github.liancheng::organize-imports:0.5.0"
   def osLib                      = ivy"com.lihaoyi::os-lib:0.8.1"
   def pprint                     = ivy"com.lihaoyi::pprint:0.7.3"
-  def prettyStacktraces          = ivy"org.virtuslab::pretty-stacktraces:0.0.1-M1"
   def scala3Compiler(sv: String) = ivy"org.scala-lang::scala3-compiler:$sv"
   def scalaAsync         = ivy"org.scala-lang.modules::scala-async:1.0.1".exclude("*" -> "*")
   def scalac(sv: String) = ivy"org.scala-lang:scala-compiler:$sv"