azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't store class loader in CompilerEnvironment

Browse Source 
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
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
+2 -4
View File
@@ -169,16 +169,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
.register(javaClass<IncrementalCacheProvider>(), IncrementalCacheProviderImpl(incrementalCaches)) .register(javaClass<IncrementalCacheProvider>(), IncrementalCacheProviderImpl(incrementalCaches))
.build() .build()
val environment = CompilerEnvironment.getEnvironmentFor( return CompilerEnvironment.getEnvironmentFor(
PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), PathUtil.getKotlinPathsForJpsPluginOrJpsTests(),
javaClass.getClassLoader(),
{ className -> { 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" || className == "org.jetbrains.jet.config.Services"
}, },
compilerServices compilerServices
) )
return environment
} }
private fun getOutputItemsAndTargets( private fun getOutputItemsAndTargets(