Multi-platform refactoring: get rid of PlatformKind (replace with MultiTargetPlatform)

compiler/tests-common/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt

@@ -474,13 +474,9 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
         val platform =
                 if (nameSuffix.isEmpty()) null
                 else if (nameSuffix == "common") MultiTargetPlatform.Common else MultiTargetPlatform.Specific(nameSuffix.toUpperCase())
-        val capabilities: Map<ModuleDescriptor.Capability<*>, Any?> =
-                if (platform == null) emptyMap()
-                else mapOf(MultiTargetPlatform.CAPABILITY to platform)
         return ModuleDescriptorImpl(
                 Name.special("<$moduleName>"), storageManager, JvmBuiltIns(storageManager),
-                if (platform == MultiTargetPlatform.Common) PlatformKind.DEFAULT else PlatformKind.JVM,
-                SourceKind.TEST, capabilities
+                platform, SourceKind.TEST
         )
     }
 

compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.resolve.MultiTargetPlatform
 import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
 import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
 
@@ -38,7 +39,8 @@ fun createResolveSessionForFiles(
             "test",
             projectContext, listOf(testModule),
             { ModuleContent(syntheticFiles, GlobalSearchScope.allScope(project)) },
-            JvmPlatformParameters { testModule }
+            JvmPlatformParameters { testModule },
+            modulePlatforms = { MultiTargetPlatform.Specific("JVM") }
     )
     return resolverForProject.resolverForModule(testModule).componentProvider.get<ResolveSession>()
 }