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

[Compatibility] Restore GradleBuildScriptManipulator.addKotlinLibraryToModuleBuildScript(scope, libraryDescriptor)

Browse Source 
#KT-33336 Fixed
This commit is contained in:
Dmitry Gridin
2019-08-14 21:03:50 +07:00
parent 63895483fd
commit 2c0d6ab1a5
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleBuildScriptManipulator.kt
+10 -1
View File
@@ -54,7 +54,16 @@ interface GradleBuildScriptManipulator<out Psi : PsiFile> {
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
)
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt
+8 -2
View File
@@ -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()
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinBuildScriptManipulator.kt
+8 -2
View File
@@ -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()