From 7906832d75712b884473ec08befcb4259700612a Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 1 Oct 2013 20:40:48 +0400 Subject: [PATCH] JPS plugin: make the code more understandable -- added some comments and rename scriptFile to moduleFile. Original commit: cfb7104ae9e3cdfa06c7a062469009b7cc981bed --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 ++ 1 file changed, 2 insertions(+) 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 b4522aec9da..39d6cef1493 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 @@ -77,6 +77,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputConsumer outputConsumer ) throws ProjectBuildException, IOException { MessageCollector messageCollector = new MessageCollectorAdapter(context); + // Workaround for Android Studio if (!isJavaPluginEnabled(context)) { messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION); return ExitCode.NOTHING_DONE; @@ -141,6 +142,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { private static boolean isJavaPluginEnabled(@NotNull CompileContext context) { try { + // Using reflection for backward compatibility with IDEA 12 Field javaPluginIsEnabledField = JavaBuilder.class.getDeclaredField("IS_ENABLED"); return Modifier.isPublic(javaPluginIsEnabledField.getModifiers()) ? JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE) : true; }