From 0db4f464bb856e4665a1ec93691cdc5efa66a51c Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Wed, 20 Sep 2023 10:55:45 +0200
Subject: [PATCH] [gradle, kmp] Minor: add more info to deprecation message

Buildscripts that used `ios`-shortcut certainly used
`val iosMain by getting` as well, which will lead to Gradle exception
after migration. Mention in the diagnostic message that one should
replace `by getting` with static accessors

^KT-60734
---
 .../plugin/diagnostics/KotlinToolingDiagnostics.kt     | 10 ++++++++++
 ...hyFallbackNativeTargetShortcutUsageDetected-ios.txt | 10 ++++++++++
 ...yFallbackNativeTargetShortcutUsageDetected-tvos.txt | 10 ++++++++++
 ...llbackNativeTargetShortcutUsageDetected-watchos.txt | 10 ++++++++++
 4 files changed, 40 insertions(+)

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 960f65ed455..db657cfd45e 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
@@ -503,6 +503,16 @@ object KotlinToolingDiagnostics {
                       /* ... */
                   }
                 
+                After that, replace `by getting` with static accessors:
+                
+                  sourceSets {
+                      commonMain { ... }
+                      
+                      ${trace.shortcut}Main {
+                          dependencies { ... }
+                      }
+                  }
+                
                 To suppress the 'Default Hierarchy Template' add
                     '$KOTLIN_MPP_APPLY_DEFAULT_HIERARCHY_TEMPLATE=false'
                 to your gradle.properties
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 c9c98af6109..9d48ded9870 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,6 +14,16 @@ Please declare the required targets explicitly:
       /* ... */
   }
 
+After that, replace `by getting` with a static accessor:
+
+  sourceSets {
+      commonMain { ... }
+
+      iosMain {
+          dependencies { ... }
+      }
+  }
+
 To suppress the 'Default Hierarchy Template' add
     'kotlin.mpp.applyDefaultHierarchyTemplate=false'
 to your gradle.properties
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 e3a8a7ba7c8..9e3f986510b 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,6 +14,16 @@ Please declare the required targets explicitly:
       /* ... */
   }
 
+After that, replace `by getting` with a static accessor:
+
+  sourceSets {
+      commonMain { ... }
+
+      tvosMain {
+          dependencies { ... }
+      }
+  }
+
 To suppress the 'Default Hierarchy Template' add
     'kotlin.mpp.applyDefaultHierarchyTemplate=false'
 to your gradle.properties
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 e595e3b3149..1b8cc4ed250 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,6 +14,16 @@ Please declare the required targets explicitly:
       /* ... */
   }
 
+After that, replace `by getting` with a static accessor:
+
+  sourceSets {
+      commonMain { ... }
+
+      watchosMain {
+          dependencies { ... }
+      }
+  }
+
 To suppress the 'Default Hierarchy Template' add
     'kotlin.mpp.applyDefaultHierarchyTemplate=false'
 to your gradle.properties