From 2aed011bc990d53c17aafb0f4b9ac04532b2b54a Mon Sep 17 00:00:00 2001
From: Allan Renucci <allan.renucci@gmail.com>
Date: Wed, 17 Jan 2018 14:54:21 +0100
Subject: [PATCH] Cleanup

---
 .../src/main/scala/sbt/ScriptedPlugin.scala   | 26 +++++++++++--------
 .../main/scala/sbt/test/ScriptedTests.scala   |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala b/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
index a7bfdc907..a7bf73543 100644
--- a/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
+++ b/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
@@ -80,17 +80,21 @@ object ScriptedPlugin extends AutoPlugin {
       ModuleUtilities.getObject("sbt.test.ScriptedTests", loader)
     }
 
-  private[this] val fCls = classOf[File]
-  private[this] val bCls = classOf[Boolean]
-  private[this] val asCls = classOf[Array[String]]
-  private[this] val lfCls = classOf[java.util.List[File]]
-  private[this] val iCls = classOf[Integer]
-
   def scriptedRunTask: Initialize[Task[Method]] = Def.taskDyn {
+    val fCls = classOf[File]
+    val bCls = classOf[Boolean]
+    val asCls = classOf[Array[String]]
+    val lfCls = classOf[java.util.List[File]]
+    val iCls = classOf[Int]
+
     val clazz = scriptedTests.value.getClass
-    if (scriptedBatchExecution.value)
-      Def.task(clazz.getMethod("runInParallel", fCls, bCls, asCls, fCls, asCls, lfCls, iCls))
-    else Def.task(clazz.getMethod("run", fCls, bCls, asCls, fCls, asCls, lfCls))
+    val method =
+      if (scriptedBatchExecution.value)
+        clazz.getMethod("runInParallel", fCls, bCls, asCls, fCls, asCls, lfCls, iCls)
+      else
+        clazz.getMethod("run", fCls, bCls, asCls, fCls, asCls, lfCls)
+
+    Def.task(method)
   }
 
   import DefaultParsers._
@@ -150,8 +154,8 @@ object ScriptedPlugin extends AutoPlugin {
       val log: java.lang.Boolean = scriptedBufferLog.value
       val launcher = sbtLauncher.value
       val opts = scriptedLaunchOpts.value.toArray
-      val empty = new java.util.ArrayList()
-      val instances: Integer = scriptedParallelInstances.value
+      val empty = new java.util.ArrayList[File]()
+      val instances: java.lang.Integer = scriptedParallelInstances.value
 
       if (scriptedBatchExecution.value)
         method.invoke(scriptedInstance, dir, log, args.toArray, launcher, opts, empty, instances)
diff --git a/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
index 7af336a26..f516d0beb 100644
--- a/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
+++ b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
@@ -382,7 +382,7 @@ class ScriptedRunner {
       bootProps: File,
       launchOpts: Array[String],
       prescripted: java.util.List[File],
-      instances: Integer
+      instances: Int
   ): Unit = {
     val logger = ConsoleLogger()
     val addTestFile = (f: File) => { prescripted.add(f); () }