From 4b643480d66e65e05658f8fa505d0854ff2a060d Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 30 May 2023 09:50:50 +0200 Subject: [PATCH] [Gradle] Fix spelling errors in tryK2 report ^KT-58869 Fixed --- .../org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt | 6 +++--- .../jetbrains/kotlin/gradle/report/BuildReportsService.kt | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt index 3aa1bd45b65..bad770ce0b2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/experimental/TryK2IT.kt @@ -30,7 +30,7 @@ class TryK2IT : KGPBaseTest() { build("--dry-run") { assertOutputContainsExactTimes(EXPERIMENTAL_TRY_K2_WARNING_MESSAGE, 1) - assertOutputContains("No Kotlin compilation tasks have run") + assertOutputContains("No Kotlin compilation tasks have been run") } } } @@ -88,7 +88,7 @@ class TryK2IT : KGPBaseTest() { |##### 'kotlin.experimental.tryK2' results (Kotlin/Native not checked) ##### |:lib:compileKotlin: 2.0 language version |:app:compileKotlin: 2.0 language version - |##### 100% (2/2) tasks have compiled with Kotlin 2 ##### + |##### 100% (2/2) tasks have been compiled with Kotlin 2.0 ##### """.trimMargin().normalizeLineEndings() ) } @@ -119,7 +119,7 @@ class TryK2IT : KGPBaseTest() { |##### 'kotlin.experimental.tryK2' results (Kotlin/Native not checked) ##### |:lib:compileKotlin: 2.0 language version |:app:compileKotlin: 2.0 language version - |##### 100% (2/2) tasks have compiled with Kotlin 2 ##### + |##### 100% (2/2) tasks have been compiled with Kotlin 2.0 ##### """.trimMargin().normalizeLineEndings() ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportsService.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportsService.kt index a75b40ac6e0..f4a6eda0c90 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportsService.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/BuildReportsService.kt @@ -243,7 +243,7 @@ class BuildReportsService { } log.warn("##### 'kotlin.experimental.tryK2' results (Kotlin/Native not checked) #####") if (tasksData.isEmpty()) { - log.warn("No Kotlin compilation tasks have run") + log.warn("No Kotlin compilation tasks have been run") log.warn("#####") } else { val tasksCountWithKotlin2 = tasksData.count { @@ -254,7 +254,9 @@ class BuildReportsService { statsData.forEach { record -> log.warn("${record.first}: ${record.second} language version") } - log.warn("##### $taskWithK2Percent% ($tasksCountWithKotlin2/${tasksData.count()}) tasks have compiled with Kotlin 2 #####") + log.warn( + "##### $taskWithK2Percent% ($tasksCountWithKotlin2/${tasksData.count()}) tasks have been compiled with Kotlin 2.0 #####" + ) } }