sbt-dotty: inline dottyScalaInstance

Author: smarter

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

@@ -13,7 +13,6 @@ import java.util.Optional
 import scala.util.Properties.isJavaAtLeast
 
 object DottyPlugin extends AutoPlugin {
-  val dottyScalaInstance = taskKey[ScalaInstance]("ScalaInstance for Dotty")
   object autoImport {
     val isDotty = settingKey[Boolean]("Is this project compiled with Dotty?")
 
@@ -269,40 +268,38 @@ object DottyPlugin extends AutoPlugin {
       },
       // ... instead, we'll fetch the compiler and its dependencies ourselves.
       scalaInstance := Def.taskDyn {
-        if (isDotty.value) dottyScalaInstance
-        else {
+        if (isDotty.value) Def.task {
+          val updateReport =
+            fetchArtifactsOf(
+              dependencyResolution.value,
+              scalaModuleInfo.value,
+              updateConfiguration.value,
+              (unresolvedWarningConfiguration in update).value,
+              streams.value.log,
+              scalaOrganization.value %% "dotty-doc" % scalaVersion.value)
+          val scalaLibraryJar = getJar(updateReport,
+            "org.scala-lang", "scala-library", revision = AllPassFilter)
+          val dottyLibraryJar = getJar(updateReport,
+            scalaOrganization.value, s"dotty-library_${scalaBinaryVersion.value}", scalaVersion.value)
+          val compilerJar = getJar(updateReport,
+            scalaOrganization.value, s"dotty-compiler_${scalaBinaryVersion.value}", scalaVersion.value)
+          val allJars =
+            getJars(updateReport, AllPassFilter, AllPassFilter, AllPassFilter)
+
+          makeScalaInstance(
+            state.value,
+            scalaVersion.value,
+            scalaLibraryJar,
+            dottyLibraryJar,
+            compilerJar,
+            allJars
+          )
+        }
+        else
           // This dereferences the Initialize graph, but keeps the Task unevaluated,
-          // so its effect gets fired only when isDotty.value evalutes to false. yay monad.
+          // so its effect gets fired only when isDotty.value evaluates to false. yay monad.
           Def.valueStrict { scalaInstance.taskValue }
-        }
       }.value,
-      dottyScalaInstance := {
-        val updateReport =
-          fetchArtifactsOf(
-            dependencyResolution.value,
-            scalaModuleInfo.value,
-            updateConfiguration.value,
-            (unresolvedWarningConfiguration in update).value,
-            streams.value.log,
-            scalaOrganization.value %% "dotty-doc" % scalaVersion.value)
-        val scalaLibraryJar = getJar(updateReport,
-          "org.scala-lang", "scala-library", revision = AllPassFilter)
-        val dottyLibraryJar = getJar(updateReport,
-          scalaOrganization.value, s"dotty-library_${scalaBinaryVersion.value}", scalaVersion.value)
-        val compilerJar = getJar(updateReport,
-          scalaOrganization.value, s"dotty-compiler_${scalaBinaryVersion.value}", scalaVersion.value)
-        val allJars =
-          getJars(updateReport, AllPassFilter, AllPassFilter, AllPassFilter)
-
-        makeScalaInstance(
-          state.value,
-          scalaVersion.value,
-          scalaLibraryJar,
-          dottyLibraryJar,
-          compilerJar,
-          allJars
-        )
-      },
 
       // Because managedScalaInstance is false, sbt won't add the standard library to our dependencies for us
       libraryDependencies ++= {