Skip to content

Commit be71714

Browse files
Abduqodiri Qurbonzodaqurbonzoda
authored andcommitted
Use associateWith for wiring compilation dependencies in JS and WasmJs
To use that same approach as in K/N.
1 parent fb5e3da commit be71714

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

plugin/main/src/kotlinx/benchmark/gradle/JsMultiplatformTasks.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,12 @@ private fun Project.createJsBenchmarkCompileTask(target: JsBenchmarkTarget): Kot
3737
sourceSet.kotlin.setSrcDirs(files("$benchmarkBuildDir/sources"))
3838
sourceSet.resources.setSrcDirs(files())
3939

40+
associateWith(compilation)
41+
4042
sourceSet.dependencies {
41-
implementation(compilation.output.allOutputs)
4243
implementation(npm("benchmark", "*"))
4344
runtimeOnly(npm("source-map-support", "*"))
4445
}
45-
project.configurations.let {
46-
it.getByName(sourceSet.implementationConfigurationName).extendsFrom(
47-
it.getByName(compilation.compileDependencyConfigurationName)
48-
)
49-
}
5046

5147
compileTaskProvider.configure {
5248
it.apply {

plugin/main/src/kotlinx/benchmark/gradle/WasmMultiplatformTasks.kt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,13 @@ private fun Project.createWasmBenchmarkCompileTask(target: WasmBenchmarkTarget):
3131
kotlinTarget.binaries.executable(benchmarkCompilation)
3232

3333
benchmarkCompilation.apply {
34-
with(kotlinSourceSets.single()) {
35-
kotlin.setSrcDirs(files("$benchmarkBuildDir/sources"))
36-
resources.setSrcDirs(files())
34+
val sourceSet = kotlinSourceSets.single()
35+
36+
sourceSet.resources.setSrcDirs(files())
37+
sourceSet.kotlin.setSrcDirs(files("$benchmarkBuildDir/sources"))
38+
39+
associateWith(compilation)
3740

38-
dependencies {
39-
implementation(compilation.output.allOutputs)
40-
}
41-
project.configurations.let {
42-
it.getByName(this.implementationConfigurationName).extendsFrom(
43-
it.getByName(compilation.compileDependencyConfigurationName)
44-
)
45-
}
46-
}
4741
compileTaskProvider.configure {
4842
it.apply {
4943
group = BenchmarksPlugin.BENCHMARKS_TASK_GROUP

0 commit comments

Comments
 (0)