From 6919f3dbb5de5d6a8cedfe6f635293dd56c1d1e6 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Wed, 30 Dec 2020 15:48:19 +0100
Subject: [PATCH] Move KotlinCacheServiceImpl to plugin-common.xml

This was done to prevent fir plugin from loading FE 1.0 services
---
 idea/resources/META-INF/caches.xml        | 3 ---
 idea/resources/META-INF/plugin-common.xml | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/resources/META-INF/caches.xml b/idea/resources/META-INF/caches.xml
index f57fdfc9eaf..7f6af3cfd3e 100644
--- a/idea/resources/META-INF/caches.xml
+++ b/idea/resources/META-INF/caches.xml
@@ -12,9 +12,6 @@
     <projectService serviceInterface="org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService"
                     serviceImplementation="org.jetbrains.kotlin.idea.caches.trackers.KotlinIDEModificationTrackerService"/>
 
-    <projectService serviceInterface="org.jetbrains.kotlin.caches.resolve.KotlinCacheService"
-                    serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheServiceImpl"/>
-
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker"/>
 
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService"/>
diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml
index 451f2eed9ba..7aa604f6ffa 100644
--- a/idea/resources/META-INF/plugin-common.xml
+++ b/idea/resources/META-INF/plugin-common.xml
@@ -290,6 +290,9 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.util.FirPluginOracleService"
                     serviceImplementation="org.jetbrains.kotlin.idea.util.FirPluginOracleServiceFE10Impl"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.caches.resolve.KotlinCacheService"
+                    serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheServiceImpl"/>
+
 
     <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>