diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleBuildScriptManipulator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleBuildScriptManipulator.kt index 6f14e61d65d..7eb86290754 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleBuildScriptManipulator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleBuildScriptManipulator.kt @@ -54,7 +54,16 @@ interface GradleBuildScriptManipulator { fun changeApiVersion(version: String, forTests: Boolean): PsiElement? fun addKotlinLibraryToModuleBuildScript( - targetModule: Module, + targetModule: Module?, + scope: DependencyScope, + libraryDescriptor: ExternalLibraryDescriptor + ) + + @Deprecated( + "Can't work with multiplatform projects", + ReplaceWith("addKotlinLibraryToModuleBuildScript(null, scope, libraryDescriptor)") + ) + fun addKotlinLibraryToModuleBuildScript( scope: DependencyScope, libraryDescriptor: ExternalLibraryDescriptor ) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt index 5ba3d815184..556a9e98503 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt @@ -184,8 +184,14 @@ class GroovyBuildScriptManipulator( override fun changeApiVersion(version: String, forTests: Boolean): PsiElement? = changeKotlinTaskParameter(scriptFile, "apiVersion", version, forTests) + @Suppress("OverridingDeprecatedMember") override fun addKotlinLibraryToModuleBuildScript( - targetModule: Module, + scope: DependencyScope, + libraryDescriptor: ExternalLibraryDescriptor + ) = addKotlinLibraryToModuleBuildScript(null, scope, libraryDescriptor) + + override fun addKotlinLibraryToModuleBuildScript( + targetModule: Module?, scope: DependencyScope, libraryDescriptor: ExternalLibraryDescriptor ) { @@ -197,7 +203,7 @@ class GroovyBuildScriptManipulator( libraryDescriptor.maxVersion ) - if (usesNewMultiplatform()) { + if (targetModule != null && usesNewMultiplatform()) { scriptFile .getKotlinBlock() .getSourceSetsBlock() diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt index f32cda3bcf2..b6e93034ac1 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt @@ -116,8 +116,14 @@ class KotlinBuildScriptManipulator( override fun changeApiVersion(version: String, forTests: Boolean): PsiElement? = scriptFile.changeKotlinTaskParameter("apiVersion", version, forTests) + @Suppress("OverridingDeprecatedMember") override fun addKotlinLibraryToModuleBuildScript( - targetModule: Module, + scope: DependencyScope, + libraryDescriptor: ExternalLibraryDescriptor + ) = addKotlinLibraryToModuleBuildScript(null, scope, libraryDescriptor) + + override fun addKotlinLibraryToModuleBuildScript( + targetModule: Module?, scope: DependencyScope, libraryDescriptor: ExternalLibraryDescriptor ) { @@ -128,7 +134,7 @@ class KotlinBuildScriptManipulator( scope.toGradleCompileScope(scriptFile.module?.getBuildSystemType() == AndroidGradle) ) - if (usesNewMultiplatform()) { + if (targetModule != null && usesNewMultiplatform()) { val findOrCreateTargetSourceSet = scriptFile .getKotlinBlock() ?.getSourceSetsBlock()