From df3604fc6a21901b92ae468001bcee3ff1ac2e9c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 19 Aug 2014 20:49:48 +0400 Subject: [PATCH] Passing services via type-safe container instead of map. Original commit: f3b7ae379f15e4bacb88990150eb7e918bc17c05 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 3de567053f6..a09cbed0ddf 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -37,9 +37,11 @@ import org.jetbrains.jet.compiler.runner.CompilerEnvironment; import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants; import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.compiler.runner.SimpleOutputItem; +import org.jetbrains.jet.config.CompilerServices; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.jps.incremental.*; +import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -125,10 +127,12 @@ public class KotlinBuilder extends ModuleLevelBuilder { incrementalCaches.put(target, dataManager.getStorage(target, IncrementalCacheStorageProvider.INSTANCE$)); } - IncrementalCacheProviderImpl cacheProvider = new IncrementalCacheProviderImpl(incrementalCaches); + CompilerServices compilerServices = new CompilerServices.Builder() + .register(IncrementalCacheProvider.class, new IncrementalCacheProviderImpl(incrementalCaches)) + .build(); CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor( - PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), cacheProvider); + PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), compilerServices); if (!environment.success()) { environment.reportErrorsTo(messageCollector); return ExitCode.ABORT;