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

[Gradle, JS] Use standard instance filtering

Browse Source
This commit is contained in:
Ilya Goncharov
2020-03-28 16:26:01 +03:00
parent bc22489aab
commit ab56ec7481
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
+1 -2
View File
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetContainerDsl
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
import org.jetbrains.kotlin.gradle.utils.matchingIsInstance
import javax.inject.Inject import javax.inject.Inject
open class KotlinJsIrTarget open class KotlinJsIrTarget
@@ -127,7 +126,7 @@ constructor(
it.compileKotlinTask.configureCommonJsOptions() it.compileKotlinTask.configureCommonJsOptions()
binaries binaries
.matchingIsInstance<JsIrBinary>() .withType(JsIrBinary::class.java)
.all { .all {
it.linkTask.configure { linkTask -> it.linkTask.configure { linkTask ->
linkTask.configureCommonJsOptions() linkTask.configureCommonJsOptions()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt
+1 -2
View File
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsReportAggregatingTestRun
import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider
import org.jetbrains.kotlin.gradle.testing.internal.kotlinTestRegistry import org.jetbrains.kotlin.gradle.testing.internal.kotlinTestRegistry
import org.jetbrains.kotlin.gradle.testing.testTaskName import org.jetbrains.kotlin.gradle.testing.testTaskName
import org.jetbrains.kotlin.gradle.utils.matchingIsInstance
open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) : open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) :
KotlinOnlyTargetConfigurator<KotlinJsIrCompilation, KotlinJsIrTarget>(true, true, kotlinPluginVersion), KotlinOnlyTargetConfigurator<KotlinJsIrCompilation, KotlinJsIrTarget>(true, true, kotlinPluginVersion),
@@ -75,7 +74,7 @@ open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) :
} }
it.binaries it.binaries
.matchingIsInstance<JsIrBinary>() .withType(JsIrBinary::class.java)
.all { .all {
it.linkTask.configure { linkTask -> it.linkTask.configure { linkTask ->
linkTask.kotlinOptions.configureOptions() linkTask.kotlinOptions.configureOptions()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/DomainObjectSets.kt
-14
View File
@@ -1,14 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.utils
import org.gradle.api.DomainObjectSet
inline fun <reified R> DomainObjectSet<*>.matchingIsInstance(): DomainObjectSet<R> {
return matching {
it is R
} as DomainObjectSet<R>
}