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

jps: (minor) fix java module detection

Browse Source 
Original commit: b5acb83325
This commit is contained in:
Sergey Rostov
2018-06-04 15:06:44 +03:00
parent 3a5610bb21
commit 60de938f22
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+1 -2
View File
@@ -266,8 +266,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
fsOperations: FSOperationsHelper fsOperations: FSOperationsHelper
): ModuleLevelBuilder.ExitCode { ): ModuleLevelBuilder.ExitCode {
// Workaround for Android Studio // Workaround for Android Studio
val isJsModule = representativeTarget is KotlinJsModuleBuildTarget if (representativeTarget is KotlinJvmModuleBuildTarget && !JavaBuilder.IS_ENABLED[context, true]) {
if (!JavaBuilder.IS_ENABLED[context, true] && !isJsModule) {
messageCollector.report(INFO, "Kotlin JPS plugin is disabled") messageCollector.report(INFO, "Kotlin JPS plugin is disabled")
return NOTHING_DONE return NOTHING_DONE
} }