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

[Gradle] Fix warnings in KotlinBrowserJsIr

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-01-29 17:11:51 +01:00
committed by Space Team
parent f4d9d98a5e
commit d0b0774c6d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
+6 -7
View File
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.WebpackDevtool
import org.jetbrains.kotlin.gradle.tasks.dependsOn import org.jetbrains.kotlin.gradle.tasks.dependsOn
import org.jetbrains.kotlin.gradle.utils.archivesName import org.jetbrains.kotlin.gradle.utils.archivesName
import org.jetbrains.kotlin.gradle.utils.doNotTrackStateCompat import org.jetbrains.kotlin.gradle.utils.doNotTrackStateCompat
import org.jetbrains.kotlin.gradle.utils.domainObjectSet
import org.jetbrains.kotlin.gradle.utils.relativeOrAbsolute import org.jetbrains.kotlin.gradle.utils.relativeOrAbsolute
import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
import javax.inject.Inject import javax.inject.Inject
@@ -41,10 +42,8 @@ abstract class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
private val nodeJs = project.rootProject.kotlinNodeJsExtension private val nodeJs = project.rootProject.kotlinNodeJsExtension
private val webpackTaskConfigurations: DomainObjectSet<Action<KotlinWebpack>> = project.objects.domainObjectSet(Action::class.java) private val webpackTaskConfigurations = project.objects.domainObjectSet<Action<KotlinWebpack>>()
as DomainObjectSet<Action<KotlinWebpack>> private val runTaskConfigurations = project.objects.domainObjectSet<Action<KotlinWebpack>>()
private val runTaskConfigurations: DomainObjectSet<Action<KotlinWebpack>> = project.objects.domainObjectSet(Action::class.java)
as DomainObjectSet<Action<KotlinWebpack>>
override val testTaskDescription: String override val testTaskDescription: String
get() = "Run all ${target.name} tests inside browser using karma and webpack" get() = "Run all ${target.name} tests inside browser using karma and webpack"
@@ -76,13 +75,13 @@ abstract class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
runTaskConfigurations.add { runTaskConfigurations.add {
it.webpackConfigApplier(body) it.webpackConfigApplier(body)
} }
testTask(Action { testTask {
it.onTestFrameworkSet { it.onTestFrameworkSet {
if (it is KotlinKarma) { if (it is KotlinKarma) {
body.execute(it.webpackConfig) body.execute(it.webpackConfig)
} }
} }
}) }
} }
override fun runTask(body: Action<KotlinWebpack>) { override fun runTask(body: Action<KotlinWebpack>) {
@@ -242,7 +241,7 @@ abstract class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
) )
} }
copy.into(binary.distribution.directory) copy.into(binary.distribution.outputDirectory)
} }
if (mode == KotlinJsBinaryMode.PRODUCTION) { if (mode == KotlinJsBinaryMode.PRODUCTION) {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/objectFactoryExt.kt
+3
View File
@@ -13,3 +13,6 @@ internal inline fun <reified T : Named> ObjectFactory.named(name: String): T =
internal inline fun <reified T : Named> ObjectFactory.newInstance(vararg args: Any?): T = internal inline fun <reified T : Named> ObjectFactory.newInstance(vararg args: Any?): T =
newInstance(T::class.java, *args) newInstance(T::class.java, *args)
internal inline fun <reified T> ObjectFactory.domainObjectSet() =
domainObjectSet(T::class.java)