Do not include buildSrc module dependencies into script dependencies (KT-30295)

^KT-30295 Fixed
2019-04-03 11:04:11 +03:00
parent aa99d8fcbe
commit 97531c8ec2
9 changed files with 94 additions and 14 deletions
@@ -44,11 +44,13 @@ data class ScriptModuleInfo(
    override fun dependencies(): List<IdeaModuleInfo> {
        return arrayListOf<IdeaModuleInfo>(this).apply {
            val scriptDependentModules = ScriptAdditionalIdeaDependenciesProvider.getRelatedModules(scriptFile, project)
-            if (scriptDependentModules.isNotEmpty()) {
-                scriptDependentModules.mapNotNull { it.productionSourceInfo() ?: it.testSourceInfo() }.forEach {
-                    this@apply.add(it)
-                    this@apply.addAll(it.dependencies())
-                }
+            scriptDependentModules.forEach {
+                addAll(it.correspondingModuleInfos())
+            }
+
+            val scriptDependentLibraries = ScriptAdditionalIdeaDependenciesProvider.getRelatedLibraries(scriptFile, project)
+            scriptDependentLibraries.forEach {
+                addAll(createLibraryInfo(project, it))
            }

            val dependenciesInfo = ScriptDependenciesInfo.ForFile(project, scriptFile, scriptDefinition)