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

[Gradle] JsCompilationDependenciesHolder should not implement HasKotlinDependencies through delegation

Browse Source 
`HasKotlinDependencies::dependencies` methods is meant to read
``*ConfigurationName` properties in implementations.
Therefore, implementation through delegate isn't possible since
delegate *can't* read overrided properties, instead it sees its own.

^KT-51457 Verification Pending
This commit is contained in:
Anton Lakotka
2022-02-24 10:12:42 +01:00
committed by Space
parent bf11704a98
commit 3cc3bf2a6b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt
+13 -8
View File
@@ -567,9 +567,8 @@ internal open class JsCompilationDetails(
protected open class JsCompilationDependenciesHolder(
val target: KotlinTarget,
val compilationPurpose: String,
val parent: HasKotlinDependencies
) : HasKotlinDependencies by parent {
val compilationPurpose: String
) : HasKotlinDependencies {
override val apiConfigurationName: String
get() = disambiguateNameInPlatform(API)
@@ -596,10 +595,16 @@ internal open class JsCompilationDetails(
simpleName
)
}
override fun dependencies(configure: KotlinDependencyHandler.() -> Unit): Unit =
DefaultKotlinDependencyHandler(this, target.project).run(configure)
override fun dependencies(configureClosure: Closure<Any?>) =
dependencies f@{ project.configure(this@f, configureClosure) }
}
override val kotlinDependenciesHolder: HasKotlinDependencies
get() = JsCompilationDependenciesHolder(target, compilationPurpose, super.kotlinDependenciesHolder)
get() = JsCompilationDependenciesHolder(target, compilationPurpose)
override val defaultSourceSetName: String
get() {
@@ -634,14 +639,14 @@ internal class JsIrCompilationDetails(target: KotlinTarget, compilationPurpose:
)
}
private class JsIrCompilationDependencyHolder(target: KotlinTarget, compilationPurpose: String, parent: HasKotlinDependencies) :
JsCompilationDependenciesHolder(target, compilationPurpose, parent) {
private class JsIrCompilationDependencyHolder(target: KotlinTarget, compilationPurpose: String) :
JsCompilationDependenciesHolder(target, compilationPurpose) {
override val disambiguationClassifierInPlatform: String?
get() = (target as KotlinJsIrTarget).disambiguationClassifierInPlatform
}
override val kotlinDependenciesHolder: HasKotlinDependencies
get() = JsIrCompilationDependencyHolder(target, compilationPurpose, super.kotlinDependenciesHolder)
get() = JsIrCompilationDependencyHolder(target, compilationPurpose)
}
internal class KotlinDependencyConfigurationsHolder(
@@ -666,4 +671,4 @@ internal class KotlinDependencyConfigurationsHolder(
override fun dependencies(configureClosure: Closure<Any?>) =
dependencies f@{ project.configure(this@f, configureClosure) }
}
}