From 60de938f224d9ecb72fb36519ae46469d579ae4f Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Mon, 4 Jun 2018 15:06:44 +0300
Subject: [PATCH] jps: (minor) fix java module detection

Original commit: b5acb833259d54fcaf3c17badcca54bbfb696ab4
---
 .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 4e07fc3d8d0..9c54e12e2ff 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -266,8 +266,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
         fsOperations: FSOperationsHelper
     ): ModuleLevelBuilder.ExitCode {
         // Workaround for Android Studio
-        val isJsModule = representativeTarget is KotlinJsModuleBuildTarget
-        if (!JavaBuilder.IS_ENABLED[context, true] && !isJsModule) {
+        if (representativeTarget is KotlinJvmModuleBuildTarget && !JavaBuilder.IS_ENABLED[context, true]) {
             messageCollector.report(INFO, "Kotlin JPS plugin is disabled")
             return NOTHING_DONE
         }