Merge pull request #464 from dwijnand/build/sync-App-and-Test

build: Sync the setup of App & Test more

Author: mergify[bot]

project/TestsPlugin.scala

@@ -135,11 +135,14 @@ object TestsPlugin extends AutoPlugin {
     scalaVersion := testScalaVersion.value,
     inConfig(V1)(funTestPerConfigSettings),
     inConfig(V2)(funTestPerConfigSettings),
-    inConfig(App)(funTestPerConfigSettings),
+    inConfig(App)(Def.settings(
+      funTestPerConfigSettings,
+      run / trapExit := false,
+    )),
     inConfig(Test)(Def.settings(
       internalDependencyClasspath ++= (V2 / exportedProducts).value,
       internalDependencyClasspath ++= (App / exportedProducts).value,
-      run / mainClass := Some("App"),
+      run / mainClass := (App / run / mainClass).value,
       run / trapExit  := false,
     )),
     Global / onLoad += oracleFileCheck.value,