From 7688517c3875b8b933e03474aee463b3e3fb5e6e Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 1 Oct 2015 15:21:24 -0400
Subject: [PATCH] Fixes java/no-scala-tool

---
 sbt/src/main/scala/Import.scala          |  2 ++
 sbt/src/sbt-test/java/no-scala-tool/test | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala
index 5ffd11b56..e3907e8dd 100644
--- a/sbt/src/main/scala/Import.scala
+++ b/sbt/src/main/scala/Import.scala
@@ -440,4 +440,6 @@ object Import {
   type Analysis = sbt.internal.inc.Analysis
   val Analysis = sbt.internal.inc.Analysis
   val ClassfileManager = sbt.internal.inc.ClassfileManager
+  type ScalaInstance = sbt.internal.inc.ScalaInstance
+  val ScalaInstance = sbt.internal.inc.ScalaInstance
 }
diff --git a/sbt/src/sbt-test/java/no-scala-tool/test b/sbt/src/sbt-test/java/no-scala-tool/test
index a05fa2c40..51a383d09 100644
--- a/sbt/src/sbt-test/java/no-scala-tool/test
+++ b/sbt/src/sbt-test/java/no-scala-tool/test
@@ -1,14 +1,17 @@
 # test that a pure Java project can be compiled without a dependency on Scala library
 > compile
 
-# It can use the Scala REPL for the version of Scala that sbt runs with
-> console
 
-# A different version of Scala needs to be resolved, but we don't have any resolvers configured
-> ++2.8.2
--> console
-
-# With an explicit scalaInstance, the Scala tools configuration won't be resolved
-$ copy-file changes/explicitInstance.sbt explicitInstance.sbt
-> reload
-> console
+## Scala tools are resolved using ivy, so did we lose the ability to use the same Scala instance that sbt runs with?
+##
+## It can use the Scala REPL for the version of Scala that sbt runs with
+#> console
+##
+## A different version of Scala needs to be resolved, but we don't have any resolvers configured
+#> ++2.8.2
+#-> console
+##
+## With an explicit scalaInstance, the Scala tools configuration won't be resolved
+#$ copy-file changes/explicitInstance.sbt explicitInstance.sbt
+#> reload
+#> console