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

Remove deprecated ConfigureUtil usages in KotlinTarget.mavenPublication

Browse Source 
^KT-46019 In Progress
This commit is contained in:
Yahor Berdnikau
2022-06-28 14:26:46 +02:00
committed by Space
parent 99c19dc046
commit c414b1ba93
2 changed files with 2 additions and 8 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/KotlinTarget.kt
+2 -3
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle.plugin package org.jetbrains.kotlin.gradle.plugin
import groovy.lang.Closure
import org.gradle.api.Action import org.gradle.api.Action
import org.gradle.api.Named import org.gradle.api.Named
import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.NamedDomainObjectContainer
@@ -47,11 +46,11 @@ interface KotlinTarget : Named, HasAttributes {
val components: Set<SoftwareComponent> val components: Set<SoftwareComponent>
fun mavenPublication(action: Closure<Unit>) fun mavenPublication(action: MavenPublication.() -> Unit) = mavenPublication(Action { action(it) })
fun mavenPublication(action: Action<MavenPublication>) fun mavenPublication(action: Action<MavenPublication>)
fun attributes(configure: AttributeContainer.() -> Unit) = attributes.configure() fun attributes(configure: AttributeContainer.() -> Unit) = attributes.configure()
fun attributes(configure: Closure<*>) = attributes { project.configure(this, configure) } fun attributes(configure: Action<AttributeContainer>) = attributes { configure.execute(this) }
val preset: KotlinTargetPreset<out KotlinTarget>? val preset: KotlinTargetPreset<out KotlinTarget>?
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
-5
View File
@@ -4,7 +4,6 @@
*/ */
package org.jetbrains.kotlin.gradle.plugin.mpp package org.jetbrains.kotlin.gradle.plugin.mpp
import groovy.lang.Closure
import org.gradle.api.Action import org.gradle.api.Action
import org.gradle.api.DomainObjectSet import org.gradle.api.DomainObjectSet
import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.NamedDomainObjectContainer
@@ -24,7 +23,6 @@ import org.gradle.api.internal.project.ProjectInternal
import org.gradle.api.publish.maven.MavenPublication import org.gradle.api.publish.maven.MavenPublication
import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.TaskProvider
import org.gradle.jvm.tasks.Jar import org.gradle.jvm.tasks.Jar
import org.gradle.util.ConfigureUtil
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
@@ -272,9 +270,6 @@ abstract class AbstractKotlinTarget(
publicationConfigureActions.add(action) publicationConfigureActions.add(action)
} }
override fun mavenPublication(action: Closure<Unit>) =
mavenPublication(ConfigureUtil.configureUsing(action))
override var preset: KotlinTargetPreset<out KotlinTarget>? = null override var preset: KotlinTargetPreset<out KotlinTarget>? = null
internal set internal set
} }