[Gradle] Fix code review comments

KT-49704

libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt

@@ -75,17 +75,15 @@ class BuildKotlinToolingMetadataTest {
         assertEquals(project.getKotlinPluginVersion(), metadata.buildPluginVersion)
         assertEquals(1, metadata.projectTargets.size, "Expected one target (metadata)")
         val targetMetadata = metadata.projectTargets.single()
-        if (kpmModelMappingEnabled) {
+        val targetClass = if (kpmModelMappingEnabled) {
-            assertTrue(
+            KotlinGradleFragment::class
-                KotlinGradleFragment::class.java.isAssignableFrom(Class.forName(targetMetadata.target)),
-                "Expect target to be implement ${KotlinGradleFragment::class.simpleName}"
-            )
         } else {
-            assertTrue(
+            KotlinMetadataTarget::class
-                KotlinMetadataTarget::class.java.isAssignableFrom(Class.forName(targetMetadata.target)),
-                "Expect target to be implement ${KotlinMetadataTarget::class.simpleName}"
-            )
         }
+        assertTrue(
+            targetClass.java.isAssignableFrom(Class.forName(targetMetadata.target)),
+            "Expect target to implement ${targetClass.simpleName}"
+        )
         assertEquals(common.name, targetMetadata.platformType)
         assertTrue(metadata.toJsonString().isNotBlank(), "Expected non blank json representation")
     }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt

@@ -105,19 +105,18 @@ private fun Project.buildProjectSettings(): KotlinToolingMetadata.ProjectSetting
     )
 }
 
-private fun KpmGradleProjectModelContainer.buildProjectTargets(): List<KotlinToolingMetadata.ProjectTargetMetadata> {
+private fun KpmGradleProjectModelContainer.buildProjectTargets(): List<KotlinToolingMetadata.ProjectTargetMetadata> =
-    val result = mutableSetOf<KotlinToolingMetadata.ProjectTargetMetadata>()
+    modules
-    val mainModules = modules.filter { it.isMain }
+        .filter { it.isMain }
-
+        .flatMap { module ->
-    for (module in mainModules) {
+            val commonTarget = KotlinToolingMetadata.ProjectTargetMetadata(
-        result += KotlinToolingMetadata.ProjectTargetMetadata(
                 target = module.common.javaClass.canonicalName,
                 platformType = KotlinPlatformType.common.name,
                 extras = KotlinToolingMetadata.ProjectTargetMetadata.Extras()
             )
 
-        for (variant in module.variants) {
+            module.variants.map { variant ->
-            result += KotlinToolingMetadata.ProjectTargetMetadata(
+                KotlinToolingMetadata.ProjectTargetMetadata(
                     target = variant.javaClass.canonicalName,
                     platformType = variant.platformType.name,
                     extras = KotlinToolingMetadata.ProjectTargetMetadata.Extras(
@@ -127,11 +126,8 @@ private fun KpmGradleProjectModelContainer.buildProjectTargets(): List<KotlinToo
                         native = variant.nativeExtrasOrNull()
                     )
                 )
-        }
+            } + commonTarget
-    }
+        }.distinct()
-
-    return result.toList()
-}
 
 private fun KotlinGradleVariant.jvmExtrasOrNull() =
     when (this) {