From 45ab07654eaecab82236133fa33135632f142534 Mon Sep 17 00:00:00 2001
From: Louis CAD <louis.cognault@gmail.com>
Date: Tue, 8 Oct 2019 13:34:55 +0200
Subject: [PATCH] Use receiver syntax for lambda execution (#2508)

---
 .../org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt   | 4 ++--
 .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt | 4 ++--
 .../jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt  | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
index 14037ae9bcf..a1617b0f837 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
@@ -55,7 +55,7 @@ interface KotlinCompilation<out T : KotlinCommonOptions> : Named, HasAttributes,
     fun kotlinOptions(configure: T.() -> Unit)
     fun kotlinOptions(configure: Closure<*>) = kotlinOptions { ConfigureUtil.configure(configure, this) }
 
-    fun attributes(configure: AttributeContainer.() -> Unit) = configure(attributes)
+    fun attributes(configure: AttributeContainer.() -> Unit) = attributes.configure()
     fun attributes(configure: Closure<*>) = attributes { ConfigureUtil.configure(configure, this) }
 
     val compileAllTaskName: String
@@ -90,4 +90,4 @@ interface KotlinCompilationToRunnableFiles<T : KotlinCommonOptions> : KotlinComp
 
 interface KotlinCompilationWithResources<T : KotlinCommonOptions> : KotlinCompilation<T> {
     val processResourcesTaskName: String
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
index 61e378c40d2..a306319e95d 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
@@ -48,7 +48,7 @@ interface KotlinTarget : Named, HasAttributes {
     fun mavenPublication(action: Closure<Unit>)
     fun mavenPublication(action: Action<MavenPublication>)
 
-    fun attributes(configure: AttributeContainer.() -> Unit) = configure(attributes)
+    fun attributes(configure: AttributeContainer.() -> Unit) = attributes.configure()
     fun attributes(configure: Closure<*>) = attributes { ConfigureUtil.configure(configure, this) }
 
     val preset: KotlinTargetPreset<out KotlinTarget>?
@@ -64,4 +64,4 @@ interface KotlinTargetWithTests<E : KotlinExecution.ExecutionSource, T : KotlinT
     companion object {
         const val DEFAULT_TEST_RUN_NAME = "test"
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
index 60c63adda1d..8a7f0ef2514 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
@@ -73,8 +73,7 @@ abstract class AbstractKotlinCompilation<T : KotlinCommonOptions>(
     override val defaultSourceSet: KotlinSourceSet
         get() = target.project.kotlinExtension.sourceSets.getByName(defaultSourceSetName)
 
-    override fun defaultSourceSet(configure: KotlinSourceSet.() -> Unit) =
-        configure(defaultSourceSet)
+    override fun defaultSourceSet(configure: KotlinSourceSet.() -> Unit) = defaultSourceSet.configure()
 
     override val output: KotlinCompilationOutput by lazy {
         DefaultKotlinCompilationOutput(