Don't store class loader in CompilerEnvironment

Modules jps-plugin and ide-compiler-runner are loaded by the same class loader

Original commit: 0d671141d0
This commit is contained in:
Alexander Udalov
2014-12-25 20:00:28 +03:00
parent 81d88090be
commit e709b0f3f6
@@ -169,16 +169,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
.register(javaClass<IncrementalCacheProvider>(), IncrementalCacheProviderImpl(incrementalCaches))
.build()
val environment = CompilerEnvironment.getEnvironmentFor(
return CompilerEnvironment.getEnvironmentFor(
PathUtil.getKotlinPathsForJpsPluginOrJpsTests(),
javaClass.getClassLoader(),
{ className ->
className!!.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.")
className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.")
|| className == "org.jetbrains.jet.config.Services"
},
compilerServices
)
return environment
}
private fun getOutputItemsAndTargets(