azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[KT-43276] Fix watchos target shortcut.

Browse Source
This commit is contained in:
Sergey Bogolepov
2020-11-27 19:10:11 +07:00
parent f3424a98b7
commit d6f54a7730
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithNativeShortcuts.kt
+1 -1
View File
@@ -94,7 +94,7 @@ interface KotlinTargetContainerWithNativeShortcuts : KotlinTargetContainerWithPr
) { ) {
val device32 = watchosArm32("${namePrefix}Arm32") val device32 = watchosArm32("${namePrefix}Arm32")
val device64 = watchosArm64("${namePrefix}Arm64") val device64 = watchosArm64("${namePrefix}Arm64")
val simulator = watchosX86("${namePrefix}X86") val simulator = watchosX64("${namePrefix}X64")
val deviceTargets = listOf(device32, device64) val deviceTargets = listOf(device32, device64)
val deviceSourceSets = createIntermediateSourceSets( val deviceSourceSets = createIntermediateSourceSets(
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
+4 -4
View File
@@ -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 * 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: * 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 * watchosArm32Main watchosArm64Main
* *
* There are two common native source sets that participate in commonization process: * 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. * 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. * 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` * - 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 * 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, * - 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 * the dependencies are evaluated from `watchosDeviceMain` viewpoint. Assuming libraries with `actual` declarations