From acf3f2a3a108ee6800572c4c068e744740c29792 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 19 Dec 2023 22:00:13 +0100 Subject: [PATCH] [Gradle] Fix warnings in NativePerformanceReport ^KT-56904 In Progress --- .../targets/native/tasks/KotlinNativePerformanceTask.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativePerformanceTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativePerformanceTask.kt index 714180a29a1..3bb76a2ca0b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativePerformanceTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativePerformanceTask.kt @@ -45,7 +45,7 @@ open class NativePerformanceReport : DefaultTask() { // Get compile task and associated with it other compile tasks. private fun getAllExecutedTasks(compilation: KotlinCompilation<*>): List { - val tasks = mutableListOf(compilation.compileKotlinTask as Task) + val tasks = mutableListOf(compilation.compileTaskProvider.get() as Task) compilation.associatedCompilations.toList().forEach { tasks += getAllExecutedTasks(it) } @@ -73,15 +73,15 @@ open class NativePerformanceReport : DefaultTask() { } private fun getPerformanceCompilerOptions() = - (compilerFlagsFromBinary() + binary.linkTask.compilation.kotlinOptions.freeCompilerArgs) + (compilerFlagsFromBinary() + binary.linkTask.toolOptions.freeCompilerArgs.get()) .filter { it in listOf("-g", "-opt", "-Xg0") }.map { "\"$it\"" } @TaskAction fun generate() { val compileTasks = if (settings.includeAssociatedTasks) - getAllExecutedTasks(binary.linkTask.compilation) + getAllExecutedTasks(binary.compilation) else - listOf(binary.linkTask.compilation.compileKotlinTask) + listOf(binary.compilation.compileTaskProvider.get()) val allExecutedTasks = listOf(binary.linkTask) + compileTasks val upToDateTasks = allExecutedTasks.filter { it.state.upToDate }.map { it.name } if (upToDateTasks.isNotEmpty()) {