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

Add impl module roots also when gradle-aware make is enabled

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-09-08 15:42:31 +02:00
parent 0caadcd2f1
commit cd44131f88
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/MultiplatformGradleProjectTaskRunner.kt
+2 -1
View File
@@ -108,8 +108,8 @@ class MultiplatformGradleOrderEnumeratorHandler : OrderEnumerationHandler() {
override fun addCustomModuleRoots(type: OrderRootType, rootModel: ModuleRootModel, result: MutableCollection<String>, includeProduction: Boolean, includeTests: Boolean): Boolean { override fun addCustomModuleRoots(type: OrderRootType, rootModel: ModuleRootModel, result: MutableCollection<String>, includeProduction: Boolean, includeTests: Boolean): Boolean {
if (type != OrderRootType.CLASSES) return false if (type != OrderRootType.CLASSES) return false
if (!ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, rootModel.module)) return false if (!ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, rootModel.module)) return false
if (GradleSystemRunningSettings.getInstance().isUseGradleAwareMake) return false
if (!GradleSystemRunningSettings.getInstance().isUseGradleAwareMake) {
val gradleProjectPath = ExternalSystemModulePropertyManager.getInstance(rootModel.module).getRootProjectPath() ?: return false val gradleProjectPath = ExternalSystemModulePropertyManager.getInstance(rootModel.module).getRootProjectPath() ?: return false
val externalProjectDataCache = ExternalProjectDataCache.getInstance(rootModel.module.project)!! val externalProjectDataCache = ExternalProjectDataCache.getInstance(rootModel.module.project)!!
val externalRootProject = externalProjectDataCache.getRootExternalProject(GradleConstants.SYSTEM_ID, val externalRootProject = externalProjectDataCache.getRootExternalProject(GradleConstants.SYSTEM_ID,
@@ -126,6 +126,7 @@ class MultiplatformGradleOrderEnumeratorHandler : OrderEnumerationHandler() {
addOutputModuleRoots(sourceSet.sources[ExternalSystemSourceType.SOURCE], result) addOutputModuleRoots(sourceSet.sources[ExternalSystemSourceType.SOURCE], result)
} }
} }
}
val implModule = rootModel.module.findJvmImplementationModule() val implModule = rootModel.module.findJvmImplementationModule()
implModule implModule