luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes java/no-scala-tool

This commit is contained in:
Eugene Yokota 2015-10-01 15:21:24 -04:00
parent e37de734f5
commit 7688517c38
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbt/src/main/scala/Import.scala
View File

@ -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
}

23
sbt/src/sbt-test/java/no-scala-tool/test
View File

@ -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