From 3eeaa07e0c946606d2817ba3f3bd1123133a5fa7 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <Vladimir.Dolzhenko@jetbrains.com>
Date: Mon, 12 Oct 2020 06:49:43 +0000
Subject: [PATCH] Sync up plugin.xml AS42 with 202

Relates to #KT-42274
---
 idea/resources-descriptors/META-INF/plugin.xml.as42 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/idea/resources-descriptors/META-INF/plugin.xml.as42 b/idea/resources-descriptors/META-INF/plugin.xml.as42
index 81cbf7e693a..b38d88819c4 100644
--- a/idea/resources-descriptors/META-INF/plugin.xml.as42
+++ b/idea/resources-descriptors/META-INF/plugin.xml.as42
@@ -27,7 +27,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="gradle-java.xml">org.jetbrains.plugins.gradle</depends>
   <depends optional="true" config-file="kotlin-gradle-testing.xml">org.jetbrains.plugins.gradle</depends>
   <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</depends>
-  <depends optional="true" config-file="maven-common.xml">org.jetbrains.idea.maven</depends>
   <depends optional="true" config-file="maven.xml">org.jetbrains.idea.maven</depends>
   <depends optional="true" config-file="testng-j.xml">TestNG-J</depends>
   <depends optional="true" config-file="coverage.xml">Coverage</depends>
@@ -77,11 +76,11 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
-    <applicationInitializedListener implementation="org.jetbrains.kotlin.idea.PluginStartupListener" />
-    <applicationService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService" />
+    <pathMacroContributor implementation="org.jetbrains.kotlin.idea.KotlinPluginMacros"/>
+    <applicationService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupApplicationService" />
 
     <postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>
-    <postStartupActivity implementation="org.jetbrains.kotlin.idea.versions.KotlinUpdatePluginStartupActivity" />
+    <projectService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService"/>
 
     <postStartupActivity implementation="org.jetbrains.kotlin.idea.completion.LookupCancelWatcher"/>
     <postStartupActivity implementation="org.jetbrains.kotlin.idea.caches.KotlinPackageContentModificationListener"/>