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

Removed reflection-based hack for IDEA 12.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-11-26 16:37:41 +03:00
parent c917459926
commit 7c1bc432db
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
+1 -14
View File
@@ -85,7 +85,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
val messageCollector = MessageCollectorAdapter(context) val messageCollector = MessageCollectorAdapter(context)
// Workaround for Android Studio // Workaround for Android Studio
if (!isJavaPluginEnabled(context)) { if (!JavaBuilder.IS_ENABLED[context, true]) {
messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION) messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION)
return NOTHING_DONE return NOTHING_DONE
} }
@@ -430,16 +430,3 @@ private fun hasKotlinDirtyOrRemovedFiles(
return chunk.getTargets().any { !KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isEmpty() } return chunk.getTargets().any { !KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isEmpty() }
} }
private fun isJavaPluginEnabled(context: CompileContext): Boolean {
try {
// Using reflection for backward compatibility with IDEA 12
val javaPluginIsEnabledField = javaClass<JavaBuilder>().getDeclaredField("IS_ENABLED")
return if (Modifier.isPublic(javaPluginIsEnabledField.getModifiers())) JavaBuilder.IS_ENABLED[context, true] else true
}
catch (e: NoSuchFieldException) {
throw IllegalArgumentException("Cannot check if Java Jps Plugin is enabled", e)
}
}