From d9ff8a46da3b8287ab97d32f1cccfcc0581b18e4 Mon Sep 17 00:00:00 2001 From: Karima Ichou Date: Wed, 17 Jul 2024 10:19:25 +0100 Subject: [PATCH] KTIJ-30548 Add check if the context module is common even is the targeted platform is not. The module could be a multiplatform module common by different tests even if the targeted platform is not common. closes https://github.com/JetBrains/intellij-community/pull/2815 GitOrigin-RevId: affff2a7de6f5957ba6f45c7716a0a3395850eeb --- .../KotlinMultiplatformAllInDirectoryConfigurationProducer.kt | 2 +- .../KotlinMultiplatformAllInPackageConfigurationProducer.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/KotlinMultiplatformAllInDirectoryConfigurationProducer.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/KotlinMultiplatformAllInDirectoryConfigurationProducer.kt index 3ef049f39b2d..1753e89b368a 100644 --- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/KotlinMultiplatformAllInDirectoryConfigurationProducer.kt +++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/KotlinMultiplatformAllInDirectoryConfigurationProducer.kt @@ -38,7 +38,7 @@ class KotlinMultiplatformAllInDirectoryConfigurationProducer } val module = context.module ?: return null - if (module.platform.isCommon()) { + if (module.platform.isCommon() || module.isMultiPlatformModule) { return null } diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/KotlinMultiplatformAllInPackageConfigurationProducer.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/KotlinMultiplatformAllInPackageConfigurationProducer.kt index 21fa44013f6a..1756ca88b58f 100644 --- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/KotlinMultiplatformAllInPackageConfigurationProducer.kt +++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/KotlinMultiplatformAllInPackageConfigurationProducer.kt @@ -60,7 +60,7 @@ class KotlinMultiplatformAllInPackageConfigurationProducer: AllInPackageGradleCo } val module = context.module ?: return null - if (module.platform.isCommon()) { + if (module.platform.isCommon() || module.isMultiPlatformModule) { return null }