Skip to content

Commit b3d1f66

Browse files
author
Abduqodiri Qurbonzoda
committed
[Plugin] Fix search of the benchmark compilation of a multiplatform target
MPP plugin has added "Compilation" postfix to configuration names of compilations. See KT-35916.
1 parent f1295b6 commit b3d1f66

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import groovy.lang.*
44
import org.gradle.api.*
55
import org.gradle.api.plugins.*
66
import org.jetbrains.kotlin.gradle.dsl.*
7+
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
78
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
89
import org.jetbrains.kotlin.gradle.plugin.mpp.*
910
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation
@@ -49,9 +50,8 @@ open class BenchmarksExtension(val project: Project) {
4950

5051
when {
5152
multiplatform != null -> {
52-
val compilations = multiplatform.targets.flatMap { it.compilations }
53-
val compilation = compilations.singleOrNull { it.apiConfigurationName.removeSuffix("Api") == name }
54-
when (compilation) {
53+
val target = multiplatform.targets.findByName(name)
54+
when (val compilation = target?.compilations?.findByName(KotlinCompilation.MAIN_COMPILATION_NAME)) {
5555
null -> {
5656
project.logger.warn("Warning: Cannot find a benchmark compilation '$name', ignoring.")
5757
BenchmarkTarget(this, name) // ignore
@@ -78,8 +78,7 @@ open class BenchmarksExtension(val project: Project) {
7878

7979
}
8080
javaExtension != null -> {
81-
val sourceSet = javaExtension.sourceSets.findByName(name)
82-
when (sourceSet) {
81+
when (val sourceSet = javaExtension.sourceSets.findByName(name)) {
8382
null -> {
8483
project.logger.warn("Warning: Cannot find a benchmark sourceSet '$name', ignoring.")
8584
BenchmarkTarget(this, name) // ignore

0 commit comments

Comments
 (0)