From 23dbe5ed3eb66f187b9520b8c04e5ff735a8c85c Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Tue, 3 Oct 2023 16:12:14 +0200 Subject: [PATCH] [mpp, tests] Minor: fix incorrect testdata It was missed on rr/CI because those tests run only on macs, and currrently CI has some troubles with that --- .../gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt | 2 +- ...ltHierarchyFallbackNativeTargetShortcutUsageDetected-ios.txt | 2 +- ...tHierarchyFallbackNativeTargetShortcutUsageDetected-tvos.txt | 2 +- ...erarchyFallbackNativeTargetShortcutUsageDetected-watchos.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt index db657cfd45e..ae5bc49dd31 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt @@ -494,7 +494,7 @@ object KotlinToolingDiagnostics { ${trace.shortcut}() } - Please declare the required targets explicitly: + Please declare the required targets explicitly: kotlin { ${trace.shortcut}X64() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-ios.txt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-ios.txt index 9d48ded9870..12a9bcae081 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-ios.txt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-ios.txt @@ -14,7 +14,7 @@ Please declare the required targets explicitly: /* ... */ } -After that, replace `by getting` with a static accessor: +After that, replace `by getting` with static accessors: sourceSets { commonMain { ... } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-tvos.txt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-tvos.txt index 9e3f986510b..3b262529819 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-tvos.txt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-tvos.txt @@ -14,7 +14,7 @@ Please declare the required targets explicitly: /* ... */ } -After that, replace `by getting` with a static accessor: +After that, replace `by getting` with static accessors: sourceSets { commonMain { ... } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-watchos.txt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-watchos.txt index 1b8cc4ed250..c36a571ff4c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-watchos.txt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/KotlinDefaultHierarchyFallbackNativeTargetShortcutUsageDetected-watchos.txt @@ -14,7 +14,7 @@ Please declare the required targets explicitly: /* ... */ } -After that, replace `by getting` with a static accessor: +After that, replace `by getting` with static accessors: sourceSets { commonMain { ... }