From d6f54a773076ae566de180581f5fa73e569daf59 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <sergey.bogolepov@jetbrains.com>
Date: Fri, 27 Nov 2020 19:10:11 +0700
Subject: [PATCH] [KT-43276] Fix `watchos` target shortcut.

---
 .../dsl/KotlinTargetContainerWithNativeShortcuts.kt       | 2 +-
 .../native/internal/KotlinNativePlatformDependencies.kt   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithNativeShortcuts.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithNativeShortcuts.kt
index 82064e0a74f..dd529b732c8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithNativeShortcuts.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithNativeShortcuts.kt
@@ -94,7 +94,7 @@ interface KotlinTargetContainerWithNativeShortcuts : KotlinTargetContainerWithPr
     ) {
         val device32 = watchosArm32("${namePrefix}Arm32")
         val device64 = watchosArm64("${namePrefix}Arm64")
-        val simulator = watchosX86("${namePrefix}X86")
+        val simulator = watchosX64("${namePrefix}X64")
         val deviceTargets = listOf(device32, device64)
 
         val deviceSourceSets = createIntermediateSourceSets(
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
index 3040e9c184b..e066a9ba6dd 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
@@ -285,16 +285,16 @@ private fun Project.findSourceSetsToAddCommonizedPlatformDependencies(): Map<Kot
                  * Why? Consider this example: There is `watchos()` shortcut in Gradle DSL that creates few native targets
                  * in HMPP project with the corresponding source set hierarchy:
                  *
-                 *                    watchosMain [commonized targets: watchosX86, watchosArm32, watchosArm64]
+                 *                    watchosMain [commonized targets: watchosX64, watchosArm32, watchosArm64]
                  *                   /           \
-                 *     watchosX86Main             watchosDeviceMain [commonized targets: watchosArm32, watchosArm64]
+                 *     watchosX64Main             watchosDeviceMain [commonized targets: watchosArm32, watchosArm64]
                  *                               /                 \
                  *               watchosArm32Main                   watchosArm64Main
                  *
                  * There are two common native source sets that participate in commonization process:
                  *
                  * 1. `watchosMain`. This source set is included into three native compilations for different native targets.
-                 *    Thus, it has three commonized targets: watchosX86, watchosArm32 and watchosArm64.
+                 *    Thus, it has three commonized targets: watchosX64, watchosArm32 and watchosArm64.
                  *
                  * 2. `watchosDeviceMain`. Two native compilations -> two commonized targets: watchosArm32 and watchosArm64.
                  *
@@ -302,7 +302,7 @@ private fun Project.findSourceSetsToAddCommonizedPlatformDependencies(): Map<Kot
                  *
                  * - When `watchosArm64Main` is processed with `watchosMain`, the dependencies are evaluated from `watchosMain`
                  *   viewpoint. This means the following: the leaf source set should get the libraries with `actual` declarations
-                 *   produced as a result of commonization of the three targets: watchosX86, watchosArm32 and watchosArm64.
+                 *   produced as a result of commonization of the three targets: watchosX64, watchosArm32 and watchosArm64.
                  *
                  * - When `watchosArm64Main` is processed with `watchosDeviceMain`, which is immediate parent according to the hierarchy,
                  *   the dependencies are evaluated from `watchosDeviceMain` viewpoint. Assuming libraries with `actual` declarations