From 982f429d6b6d0aaa37e00fcba30db2c0d43b9e60 Mon Sep 17 00:00:00 2001
From: Vyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
Date: Thu, 16 Jul 2020 16:37:22 +0200
Subject: [PATCH] Moved the IdeaDefaultIdeTargetPlatformKindProvider
 declaration from jps.xml back to jvm-common.xml

---
 idea/resources/META-INF/jps.xml        | 3 ---
 idea/resources/META-INF/jvm-common.xml | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/idea/resources/META-INF/jps.xml b/idea/resources/META-INF/jps.xml
index 0fc0f635410..176cb174d5b 100644
--- a/idea/resources/META-INF/jps.xml
+++ b/idea/resources/META-INF/jps.xml
@@ -13,9 +13,6 @@
     <postStartupActivity implementation="org.jetbrains.kotlin.idea.framework.CreateKotlinSdkActivity"/>
     <facetType implementation="org.jetbrains.kotlin.idea.facet.KotlinFacetTypeImpl"/>
     <library.type implementation="org.jetbrains.kotlin.idea.framework.CommonLibraryType"/>
-    <applicationService
-        serviceInterface="org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider"
-        serviceImplementation="org.jetbrains.kotlin.platform.impl.IdeaDefaultIdeTargetPlatformKindProvider"/>
 
     <projectService serviceInterface="org.jetbrains.kotlin.config.KotlinFacetSettingsProvider"
                     serviceImplementation="org.jetbrains.kotlin.idea.facet.KotlinFacetSettingsProviderImpl"/>
diff --git a/idea/resources/META-INF/jvm-common.xml b/idea/resources/META-INF/jvm-common.xml
index 4c89e290856..912cc002c22 100644
--- a/idea/resources/META-INF/jvm-common.xml
+++ b/idea/resources/META-INF/jvm-common.xml
@@ -136,6 +136,10 @@
         <projectService serviceInterface="org.jetbrains.uast.kotlin.KotlinUastResolveProviderService"
                         serviceImplementation="org.jetbrains.uast.kotlin.internal.IdeaKotlinUastResolveProviderService"/>
 
+        <applicationService
+            serviceInterface="org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider"
+            serviceImplementation="org.jetbrains.kotlin.platform.impl.IdeaDefaultIdeTargetPlatformKindProvider"/>
+
         <applicationService
             serviceInterface="org.jetbrains.kotlin.idea.j2k.J2KPostProcessingRegistrar"
             serviceImplementation="org.jetbrains.kotlin.idea.j2k.J2KPostProcessingRegistrarImpl"/>