NIT Refactor integration tests

  - add missing type annotations
  - update to newer syntax
  - fix formatting
  - other misc fixes

Author: Gedochao

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

@@ -1,17 +1,18 @@
 package scala.cli.integration
 
 import com.eed3si9n.expecty.Expecty.expect
+import os.proc
 
 import scala.cli.integration.util.BloopUtil
 
 class BloopTests extends ScalaCliSuite {
 
-  def runScalaCli(args: String*) = os.proc(TestUtil.cli, args)
+  def runScalaCli(args: String*): proc = os.proc(TestUtil.cli, args)
 
   private lazy val bloopDaemonDir =
     BloopUtil.bloopDaemonDir(runScalaCli("directories").call().out.text())
 
-  val dummyInputs = TestInputs(
+  val dummyInputs: TestInputs = TestInputs(
     os.rel / "Test.scala" ->
       """//> using scala "2.13"
         |object Test {

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

@@ -4,7 +4,7 @@ import com.eed3si9n.expecty.Expecty.expect
 
 class CleanTests extends ScalaCliSuite {
 
-  override def group = ScalaCliSuite.TestGroup.First
+  override def group: ScalaCliSuite.TestGroup = ScalaCliSuite.TestGroup.First
 
   test("simple") {
     val inputs = TestInputs(

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

@@ -10,13 +10,13 @@ import scala.cli.integration.util.BloopUtil
 abstract class CompileTestDefinitions(val scalaVersionOpt: Option[String])
     extends ScalaCliSuite with TestScalaVersionArgs {
 
-  protected lazy val extraOptions = scalaVersionArgs ++ TestUtil.extraOptions
+  protected lazy val extraOptions: Seq[String] = scalaVersionArgs ++ TestUtil.extraOptions
 
   private lazy val bloopDaemonDir = BloopUtil.bloopDaemonDir {
     os.proc(TestUtil.cli, "directories").call().out.text()
   }
 
-  val simpleInputs = TestInputs(
+  val simpleInputs: TestInputs = TestInputs(
     os.rel / "MyTests.test.scala" ->
       """//> using lib "com.lihaoyi::utest::0.7.10"
         |import utest._
@@ -32,7 +32,7 @@ abstract class CompileTestDefinitions(val scalaVersionOpt: Option[String])
         |""".stripMargin
   )
 
-  val mainAndTestInputs = TestInputs(
+  val mainAndTestInputs: TestInputs = TestInputs(
     os.rel / "Main.scala" ->
       """//> using lib "com.lihaoyi::utest:0.7.10"
         |
@@ -201,25 +201,25 @@ abstract class CompileTestDefinitions(val scalaVersionOpt: Option[String])
 
   val jvmT = new munit.Tag("jvm-resolution")
 
-  val scalaJvm8Project =
+  val scalaJvm8Project: TestInputs =
     TestInputs(os.rel / "Main.scala" -> s"object Main{java.util.Optional.of(1).isPresent}")
-  val scalaJvm11Project =
+  val scalaJvm11Project: TestInputs =
     TestInputs(os.rel / "Main.scala" -> s"object Main{java.util.Optional.of(1).isEmpty}")
-  val javaJvm8Project =
+  val javaJvm8Project: TestInputs =
     TestInputs(os.rel / "Main.java" -> """|public class Main{
                                           |  public static void main(String[] args) {
                                           |      java.util.Optional.of(1).isPresent();
                                           |  }
                                           |}""".stripMargin)
 
-  val javaJvm11Project =
+  val javaJvm11Project: TestInputs =
     TestInputs(os.rel / "Main.java" -> """|public class Main{
                                           |  public static void main(String[] args) {
                                           |      java.util.Optional.of(1).isEmpty();
                                           |  }
                                           |}""".stripMargin)
 
-  val inputs = Map(
+  val inputs: Map[(String, Int), TestInputs] = Map(
     ("scala", 8)  -> scalaJvm8Project,
     ("scala", 11) -> scalaJvm11Project,
     ("java", 8)   -> javaJvm8Project,
@@ -264,7 +264,7 @@ abstract class CompileTestDefinitions(val scalaVersionOpt: Option[String])
     targetJvm: String,
     shouldSucceed: Boolean,
     inputs: TestInputs
-  ) =
+  ): Unit =
     inputs.fromRoot { root =>
       val bloop = BloopUtil.bloop(Constants.bloopVersion, bloopDaemonDir, jvm = Some(bloopJvm))
       bloop(Seq("exit")).call(
@@ -296,7 +296,7 @@ abstract class CompileTestDefinitions(val scalaVersionOpt: Option[String])
           stderr = os.Pipe
         )
         val stderr = res.err.text()
-        expect(s"\\[.*warn.*\\].*Conflicting options.*".r.findFirstMatchIn(stderr).isDefined)
+        expect(s"\\[.*warn.*].*Conflicting options.*".r.findFirstMatchIn(stderr).isDefined)
 
       }
     }

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

@@ -6,7 +6,7 @@ class CompileTests212 extends CompileTestDefinitions(
 ) {
 // format: on
 
-  val pluginInputs = TestInputs(
+  val pluginInputs: TestInputs = TestInputs(
     os.rel / "Plugin.scala" ->
       // Copied from (https://github.com/typelevel/kind-projector/blob/00bf25cef1b7d01d61a3555cccb6cf38fe30e117/src/test/scala/polylambda.scala)
       """object Plugin {

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

@@ -4,7 +4,7 @@ import com.eed3si9n.expecty.Expecty.expect
 
 class ConfigTests extends ScalaCliSuite {
 
-  override def group = ScalaCliSuite.TestGroup.First
+  override def group: ScalaCliSuite.TestGroup = ScalaCliSuite.TestGroup.First
 
   test("simple") {
     val homeDir    = os.rel / "home"

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

@@ -4,7 +4,7 @@ import com.eed3si9n.expecty.Expecty.expect
 
 class DefaultFileTests extends ScalaCliSuite {
 
-  override def group = ScalaCliSuite.TestGroup.First
+  override def group: ScalaCliSuite.TestGroup = ScalaCliSuite.TestGroup.First
 
   test("Print .gitignore") {
     val res = os.proc(TestUtil.cli, "default-file", ".gitignore")

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

@@ -5,7 +5,7 @@ import com.eed3si9n.expecty.Expecty.expect
 abstract class DocTestDefinitions(val scalaVersionOpt: Option[String])
     extends ScalaCliSuite with TestScalaVersionArgs {
 
-  protected lazy val extraOptions = scalaVersionArgs ++ TestUtil.extraOptions
+  protected lazy val extraOptions: Seq[String] = scalaVersionArgs ++ TestUtil.extraOptions
 
   test("generate static scala doc") {
     val dest = os.rel / "doc-static"

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

@@ -9,7 +9,7 @@ import scala.util.Properties
 abstract class ExportMillTestDefinitions(val scalaVersionOpt: Option[String])
     extends ScalaCliSuite with TestScalaVersionArgs {
 
-  protected lazy val extraOptions = scalaVersionArgs ++ TestUtil.extraOptions
+  protected lazy val extraOptions: Seq[String] = scalaVersionArgs ++ TestUtil.extraOptions
 
   protected def runExportTests: Boolean =
     Properties.isLinux

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

@@ -9,7 +9,7 @@ import scala.util.Properties
 abstract class ExportSbtTestDefinitions(val scalaVersionOpt: Option[String])
     extends ScalaCliSuite with TestScalaVersionArgs {
 
-  protected lazy val extraOptions = scalaVersionArgs ++ TestUtil.extraOptions
+  protected lazy val extraOptions: Seq[String] = scalaVersionArgs ++ TestUtil.extraOptions
 
   protected def runExportTests: Boolean =
     Properties.isLinux

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

@@ -4,7 +4,7 @@ import com.eed3si9n.expecty.Expecty.expect
 
 class FmtTests extends ScalaCliSuite {
 
-  override def group = ScalaCliSuite.TestGroup.First
+  override def group: ScalaCliSuite.TestGroup = ScalaCliSuite.TestGroup.First
 
   val confFileName = ".scalafmt.conf"