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

Add `ZincCompilerUtil` to get the Scalac compiler 

* Move `IncrementalCompilerUtil` to `ZincCompilerUtil`.
* Change `IncrementalCompilerUtil` to an interface with static methods.
* Remove bug in which ScalaInstance implementation was leaking to the
  public API.
This commit is contained in:
jvican 2017-05-22 15:42:59 +02:00
parent 96f7e08864
commit c8560c6b4e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/zinc-ivy-integration/src/main/java/sbt/inc/ZincBridgeProvider.java
View File

@ -1,5 +1,6 @@
package sbt.inc;
import sbt.internal.inc.ZincComponentCompiler;
import sbt.internal.inc.ZincComponentCompiler$;
import sbt.internal.inc.ZincComponentManager;
import sbt.internal.librarymanagement.IvyConfiguration;
@ -24,7 +25,7 @@ public final class ZincBridgeProvider {
* @return A local ivy resolver.
*/
public static Resolver getLocalResolver() {
return ZincComponentCompiler$.MODULE$.LocalResolver();
return ZincComponentCompiler.LocalResolver();
}
/**
@ -44,7 +45,7 @@ public final class ZincBridgeProvider {
* @return A default ivy configuration ready for fetching Zinc compiler components.
*/
public static IvyConfiguration getDefaultConfiguration(File baseDirectory, File ivyHome, Resolver[] resolvers, Logger logger) {
return ZincComponentCompiler$.MODULE$.getDefaultConfiguration(baseDirectory, ivyHome, resolvers, logger);
return ZincComponentCompiler.getDefaultConfiguration(baseDirectory, ivyHome, resolvers, logger);
}
/**
@ -56,7 +57,7 @@ public final class ZincBridgeProvider {
* @return A default global lock.
*/
public static GlobalLock getDefaultLock() {
return ZincComponentCompiler$.MODULE$.getDefaultLock();
return ZincComponentCompiler.getDefaultLock();
}
/**
@ -71,7 +72,7 @@ public final class ZincBridgeProvider {
* @return A default component provider.
*/
public static ComponentProvider getDefaultComponentProvider(File componentsRoot) {
return ZincComponentCompiler$.MODULE$.getDefaultComponentProvider(componentsRoot);
return ZincComponentCompiler.getDefaultComponentProvider(componentsRoot);
}
/**
@ -91,6 +92,6 @@ public final class ZincBridgeProvider {
IvyConfiguration ivyConfiguration,
Logger logger) {
ZincComponentManager manager = new ZincComponentManager(lock, componentProvider, None$.empty(), logger);
return ZincComponentCompiler$.MODULE$.interfaceProvider(manager, ivyConfiguration, scalaJarsTarget);
return ZincComponentCompiler.interfaceProvider(manager, ivyConfiguration, scalaJarsTarget);
}
}