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

Use receiver syntax for lambda execution (#2508)

Browse Source
This commit is contained in:
Louis CAD
2019-10-08 13:34:55 +02:00
committed by Sergey Igushkin
parent ddc5a62e4a
commit 45ab07654e
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
+2 -2
View File
@@ -55,7 +55,7 @@ interface KotlinCompilation<out T : KotlinCommonOptions> : Named, HasAttributes,
fun kotlinOptions(configure: T.() -> Unit) fun kotlinOptions(configure: T.() -> Unit)
fun kotlinOptions(configure: Closure<*>) = kotlinOptions { ConfigureUtil.configure(configure, this) } 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) } fun attributes(configure: Closure<*>) = attributes { ConfigureUtil.configure(configure, this) }
val compileAllTaskName: String val compileAllTaskName: String
@@ -90,4 +90,4 @@ interface KotlinCompilationToRunnableFiles<T : KotlinCommonOptions> : KotlinComp
interface KotlinCompilationWithResources<T : KotlinCommonOptions> : KotlinCompilation<T> { interface KotlinCompilationWithResources<T : KotlinCommonOptions> : KotlinCompilation<T> {
val processResourcesTaskName: String val processResourcesTaskName: String
} }
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
+2 -2
View File
@@ -48,7 +48,7 @@ interface KotlinTarget : Named, HasAttributes {
fun mavenPublication(action: Closure<Unit>) fun mavenPublication(action: Closure<Unit>)
fun mavenPublication(action: Action<MavenPublication>) 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) } fun attributes(configure: Closure<*>) = attributes { ConfigureUtil.configure(configure, this) }
val preset: KotlinTargetPreset<out KotlinTarget>? val preset: KotlinTargetPreset<out KotlinTarget>?
@@ -64,4 +64,4 @@ interface KotlinTargetWithTests<E : KotlinExecution.ExecutionSource, T : KotlinT
companion object { companion object {
const val DEFAULT_TEST_RUN_NAME = "test" const val DEFAULT_TEST_RUN_NAME = "test"
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+1 -2
View File
@@ -73,8 +73,7 @@ abstract class AbstractKotlinCompilation<T : KotlinCommonOptions>(
override val defaultSourceSet: KotlinSourceSet override val defaultSourceSet: KotlinSourceSet
get() = target.project.kotlinExtension.sourceSets.getByName(defaultSourceSetName) get() = target.project.kotlinExtension.sourceSets.getByName(defaultSourceSetName)
override fun defaultSourceSet(configure: KotlinSourceSet.() -> Unit) = override fun defaultSourceSet(configure: KotlinSourceSet.() -> Unit) = defaultSourceSet.configure()
configure(defaultSourceSet)
override val output: KotlinCompilationOutput by lazy { override val output: KotlinCompilationOutput by lazy {
DefaultKotlinCompilationOutput( DefaultKotlinCompilationOutput(