From c414b1ba93ff30ad24fe2563d24b1fd345766c57 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Tue, 28 Jun 2022 14:26:46 +0200
Subject: [PATCH] Remove deprecated ConfigureUtil usages in
 KotlinTarget.mavenPublication

^KT-46019 In Progress
---
 .../org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt       | 5 ++---
 .../org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt  | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
index 4acb27f73a5..64c6b3e3335 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.gradle.plugin
 
-import groovy.lang.Closure
 import org.gradle.api.Action
 import org.gradle.api.Named
 import org.gradle.api.NamedDomainObjectContainer
@@ -47,11 +46,11 @@ interface KotlinTarget : Named, HasAttributes {
 
     val components: Set<SoftwareComponent>
 
-    fun mavenPublication(action: Closure<Unit>)
+    fun mavenPublication(action: MavenPublication.() -> Unit) = mavenPublication(Action { action(it) })
     fun mavenPublication(action: Action<MavenPublication>)
 
     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>?
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
index ee1030ea127..45f6171510c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
@@ -4,7 +4,6 @@
  */
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
-import groovy.lang.Closure
 import org.gradle.api.Action
 import org.gradle.api.DomainObjectSet
 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.tasks.TaskProvider
 import org.gradle.jvm.tasks.Jar
-import org.gradle.util.ConfigureUtil
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.plugin.*
@@ -272,9 +270,6 @@ abstract class AbstractKotlinTarget(
         publicationConfigureActions.add(action)
     }
 
-    override fun mavenPublication(action: Closure<Unit>) =
-        mavenPublication(ConfigureUtil.configureUsing(action))
-
     override var preset: KotlinTargetPreset<out KotlinTarget>? = null
         internal set
 }