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

Remove deprecated ConfigureUtil usages in HasKotlinDependencies

Browse Source 
^KT-46019 In Progress
This commit is contained in:
Yahor Berdnikau
2022-06-28 12:50:18 +02:00
committed by Space
parent 4b0ba493b7
commit f0cfe60734
37 changed files with 684 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt
+2 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.plugin
import groovy.lang.Closure
import org.gradle.api.Action
import org.gradle.api.Project
import org.gradle.api.artifacts.Dependency
import org.gradle.api.artifacts.ExternalModuleDependency
@@ -164,7 +165,7 @@ interface KotlinDependencyHandler {
interface HasKotlinDependencies {
fun dependencies(configure: KotlinDependencyHandler.() -> Unit)
fun dependencies(configureClosure: Closure<Any?>)
fun dependencies(configure: Action<KotlinDependencyHandler>)
val apiConfigurationName: String
val implementationConfigurationName: String
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
+4 -4
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.gradle.plugin
import groovy.lang.Closure
import org.gradle.api.Action
import org.gradle.api.Named
import org.gradle.api.attributes.AttributeContainer
import org.gradle.api.attributes.HasAttributes
@@ -38,7 +38,7 @@ interface KotlinCompilation<out T : KotlinCommonOptions> : Named, HasAttributes,
val defaultSourceSet: KotlinSourceSet
fun defaultSourceSet(configure: KotlinSourceSet.() -> Unit)
fun defaultSourceSet(configure: Closure<*>) = defaultSourceSet { target.project.configure(this, configure) }
fun defaultSourceSet(configure: Action<KotlinSourceSet>) = defaultSourceSet { configure.execute(this) }
val compileDependencyConfigurationName: String
@@ -57,10 +57,10 @@ interface KotlinCompilation<out T : KotlinCommonOptions> : Named, HasAttributes,
val kotlinOptions: T
fun kotlinOptions(configure: T.() -> Unit)
fun kotlinOptions(configure: Closure<*>) = kotlinOptions { target.project.configure(this, configure) }
fun kotlinOptions(configure: Action<@UnsafeVariance T>) = kotlinOptions { configure.execute(this) }
fun attributes(configure: AttributeContainer.() -> Unit) = attributes.configure()
fun attributes(configure: Closure<*>) = attributes { target.project.configure(this, configure) }
fun attributes(configure: Action<AttributeContainer>) = attributes { configure.execute(this) }
val compileAllTaskName: String
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt
+6 -3
View File
@@ -5,19 +5,22 @@
package org.jetbrains.kotlin.gradle.plugin
import groovy.lang.Closure
import org.gradle.api.Action
import org.gradle.api.Named
import org.gradle.api.file.SourceDirectorySet
interface KotlinSourceSet : Named, HasKotlinDependencies {
val kotlin: SourceDirectorySet
fun kotlin(configureClosure: Closure<Any?>): SourceDirectorySet
fun kotlin(configure: SourceDirectorySet.() -> Unit): SourceDirectorySet
fun kotlin(configure: Action<SourceDirectorySet>): SourceDirectorySet
val resources: SourceDirectorySet
val languageSettings: LanguageSettingsBuilder
fun languageSettings(configure: LanguageSettingsBuilder.() -> Unit): LanguageSettingsBuilder
fun languageSettings(configureClosure: Closure<Any?>): LanguageSettingsBuilder
fun languageSettings(configure: Action<LanguageSettingsBuilder>): LanguageSettingsBuilder
fun dependsOn(other: KotlinSourceSet)
val dependsOn: Set<KotlinSourceSet>
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmFragment.kt
+4 -3
View File
@@ -5,12 +5,13 @@
package org.jetbrains.kotlin.gradle.plugin.mpp.pm20
import groovy.lang.Closure
import org.gradle.api.Action
import org.gradle.api.Named
import org.gradle.api.NamedDomainObjectProvider
import org.gradle.api.Project
import org.gradle.api.file.SourceDirectorySet
import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder
import org.jetbrains.kotlin.project.model.KpmFragment
import org.jetbrains.kotlin.project.model.utils.variantsContainingFragment
@@ -44,8 +45,8 @@ interface GradleKpmFragment : KpmFragment, HasKotlinDependencies, GradleKpmFragm
override val withRefinesClosure: Set<GradleKpmFragment>
get() = this.withClosure { it.declaredRefinesDependencies }
override fun dependencies(configureClosure: Closure<Any?>) =
dependencies f@{ project.configure(this@f, configureClosure) }
override fun dependencies(configure: Action<KotlinDependencyHandler>) =
dependencies { configure.execute(this) }
companion object {
const val COMMON_FRAGMENT_NAME = "common"
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmModule.kt
+3 -7
View File
@@ -5,11 +5,7 @@
package org.jetbrains.kotlin.gradle.plugin.mpp.pm20
import groovy.lang.Closure
import org.gradle.api.ExtensiblePolymorphicDomainObjectContainer
import org.gradle.api.Named
import org.gradle.api.NamedDomainObjectSet
import org.gradle.api.Project
import org.gradle.api.*
import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import org.jetbrains.kotlin.project.model.KpmModule
@@ -56,8 +52,8 @@ interface GradleKpmModule : KpmModule, Named, HasKotlinDependencies {
override fun dependencies(configure: KotlinDependencyHandler.() -> Unit) =
common.dependencies(configure)
override fun dependencies(configureClosure: Closure<Any?>) =
common.dependencies(configureClosure)
override fun dependencies(configure: Action<KotlinDependencyHandler>) =
dependencies { configure.execute(this) }
override val apiConfigurationName: String
get() = common.apiConfigurationName