From 9b5b0447fab072597f71917a2de647127e2c69ba Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Fri, 22 Mar 2019 16:13:39 +0300
Subject: [PATCH] only load inspections when groovy plugin is present KT-30579

otherwise, a user who disables Groovy support gets NoClassDefFound errors
---
 idea/resources/META-INF/gradle-groovy.xml    | 42 ++++++++++++++++++++
 idea/resources/META-INF/gradle-java.xml      | 40 +------------------
 idea/resources/META-INF/gradle-java.xml.191  | 39 +-----------------
 idea/resources/META-INF/gradle-java.xml.as33 | 39 +-----------------
 idea/resources/META-INF/gradle-java.xml.as34 | 39 +-----------------
 5 files changed, 46 insertions(+), 153 deletions(-)
 create mode 100644 idea/resources/META-INF/gradle-groovy.xml

diff --git a/idea/resources/META-INF/gradle-groovy.xml b/idea/resources/META-INF/gradle-groovy.xml
new file mode 100644
index 00000000000..a3893dc9af9
--- /dev/null
+++ b/idea/resources/META-INF/gradle-groovy.xml
@@ -0,0 +1,42 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+
+    <localInspection
+        implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentKotlinGradleVersionInspection"
+        displayName="Kotlin Gradle and IDE plugins versions are different"
+        groupName="Kotlin"
+        enabledByDefault="true"
+        language="Groovy"
+        hasStaticDescription="true"
+        level="WARNING"/>
+
+    <localInspection
+        implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentStdlibGradleVersionInspection"
+        displayName="Kotlin library and Gradle plugin versions are different"
+        groupName="Kotlin"
+        enabledByDefault="true"
+        language="Groovy"
+        hasStaticDescription="true"
+        level="WARNING"/>
+
+    <localInspection
+        implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DeprecatedGradleDependencyInspection"
+        displayName="Deprecated library is used in Gradle"
+        groupName="Kotlin"
+        enabledByDefault="true"
+        cleanupTool="true"
+        language="Groovy"
+        hasStaticDescription="true"
+        level="WARNING"/>
+
+    <localInspection
+        implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.GradleKotlinxCoroutinesDeprecationInspection"
+        displayName="Incompatible kotlinx.coroutines dependency is used with Kotlin 1.3+ in Gradle"
+        groupPath="Kotlin,Migration"
+        groupName="Gradle"
+        enabledByDefault="true"
+        language="Groovy"
+        hasStaticDescription="true"
+        level="ERROR"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/idea/resources/META-INF/gradle-java.xml b/idea/resources/META-INF/gradle-java.xml
index 7fcb68863b0..81c6ab7a814 100644
--- a/idea/resources/META-INF/gradle-java.xml
+++ b/idea/resources/META-INF/gradle-java.xml
@@ -1,4 +1,5 @@
 <idea-plugin>
+    <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</depends>
     <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
         <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJavaFrameworkSupportProvider"/>
         <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJSFrameworkSupportProvider"/>
@@ -19,45 +20,6 @@
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinTargetDataService"/>
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.KotlinJavaMPPSourceSetDataService"/>
         <externalSystemTaskNotificationListener implementation="org.jetbrains.kotlin.idea.core.script.ReloadGradleTemplatesOnSync"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentKotlinGradleVersionInspection"
-            displayName="Kotlin Gradle and IDE plugins versions are different"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentStdlibGradleVersionInspection"
-            displayName="Kotlin library and Gradle plugin versions are different"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DeprecatedGradleDependencyInspection"
-            displayName="Deprecated library is used in Gradle"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            cleanupTool="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.GradleKotlinxCoroutinesDeprecationInspection"
-            displayName="Incompatible kotlinx.coroutines dependency is used with Kotlin 1.3+ in Gradle"
-            groupPath="Kotlin,Migration"
-            groupName="Gradle"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="ERROR"/>
-
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestClassGradleConfigurationProducer"/>
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestMethodGradleConfigurationProducer"/>
         <orderEnumerationHandlerFactory implementation="org.jetbrains.kotlin.android.KotlinAndroidGradleOrderEnumerationHandler$FactoryImpl" order="first"/>
diff --git a/idea/resources/META-INF/gradle-java.xml.191 b/idea/resources/META-INF/gradle-java.xml.191
index 185e52ca628..27ff02a9b5f 100644
--- a/idea/resources/META-INF/gradle-java.xml.191
+++ b/idea/resources/META-INF/gradle-java.xml.191
@@ -1,4 +1,5 @@
 <idea-plugin>
+    <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</depends>
     <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
         <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJavaFrameworkSupportProvider"/>
         <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJSFrameworkSupportProvider"/>
@@ -20,44 +21,6 @@
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.KotlinJavaMPPSourceSetDataService"/>
         <externalSystemTaskNotificationListener implementation="org.jetbrains.kotlin.idea.core.script.ReloadGradleTemplatesOnSync"/>
 
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentKotlinGradleVersionInspection"
-            displayName="Kotlin Gradle and IDE plugins versions are different"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentStdlibGradleVersionInspection"
-            displayName="Kotlin library and Gradle plugin versions are different"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DeprecatedGradleDependencyInspection"
-            displayName="Deprecated library is used in Gradle"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            cleanupTool="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.GradleKotlinxCoroutinesDeprecationInspection"
-            displayName="Incompatible kotlinx.coroutines dependency is used with Kotlin 1.3+ in Gradle"
-            groupPath="Kotlin,Migration"
-            groupName="Gradle"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="ERROR"/>
-
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestClassGradleConfigurationProducer"/>
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestMethodGradleConfigurationProducer"/>
 
diff --git a/idea/resources/META-INF/gradle-java.xml.as33 b/idea/resources/META-INF/gradle-java.xml.as33
index 185e52ca628..27ff02a9b5f 100644
--- a/idea/resources/META-INF/gradle-java.xml.as33
+++ b/idea/resources/META-INF/gradle-java.xml.as33
@@ -1,4 +1,5 @@
 <idea-plugin>
+    <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</depends>
     <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
         <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJavaFrameworkSupportProvider"/>
         <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJSFrameworkSupportProvider"/>
@@ -20,44 +21,6 @@
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.KotlinJavaMPPSourceSetDataService"/>
         <externalSystemTaskNotificationListener implementation="org.jetbrains.kotlin.idea.core.script.ReloadGradleTemplatesOnSync"/>
 
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentKotlinGradleVersionInspection"
-            displayName="Kotlin Gradle and IDE plugins versions are different"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentStdlibGradleVersionInspection"
-            displayName="Kotlin library and Gradle plugin versions are different"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DeprecatedGradleDependencyInspection"
-            displayName="Deprecated library is used in Gradle"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            cleanupTool="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.GradleKotlinxCoroutinesDeprecationInspection"
-            displayName="Incompatible kotlinx.coroutines dependency is used with Kotlin 1.3+ in Gradle"
-            groupPath="Kotlin,Migration"
-            groupName="Gradle"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="ERROR"/>
-
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestClassGradleConfigurationProducer"/>
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestMethodGradleConfigurationProducer"/>
 
diff --git a/idea/resources/META-INF/gradle-java.xml.as34 b/idea/resources/META-INF/gradle-java.xml.as34
index 185e52ca628..27ff02a9b5f 100644
--- a/idea/resources/META-INF/gradle-java.xml.as34
+++ b/idea/resources/META-INF/gradle-java.xml.as34
@@ -1,4 +1,5 @@
 <idea-plugin>
+    <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</depends>
     <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
         <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJavaFrameworkSupportProvider"/>
         <frameworkSupport implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinJSFrameworkSupportProvider"/>
@@ -20,44 +21,6 @@
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.KotlinJavaMPPSourceSetDataService"/>
         <externalSystemTaskNotificationListener implementation="org.jetbrains.kotlin.idea.core.script.ReloadGradleTemplatesOnSync"/>
 
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentKotlinGradleVersionInspection"
-            displayName="Kotlin Gradle and IDE plugins versions are different"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentStdlibGradleVersionInspection"
-            displayName="Kotlin library and Gradle plugin versions are different"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DeprecatedGradleDependencyInspection"
-            displayName="Deprecated library is used in Gradle"
-            groupName="Kotlin"
-            enabledByDefault="true"
-            cleanupTool="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="WARNING"/>
-
-        <localInspection
-            implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.GradleKotlinxCoroutinesDeprecationInspection"
-            displayName="Incompatible kotlinx.coroutines dependency is used with Kotlin 1.3+ in Gradle"
-            groupPath="Kotlin,Migration"
-            groupName="Gradle"
-            enabledByDefault="true"
-            language="Groovy"
-            hasStaticDescription="true"
-            level="ERROR"/>
-
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestClassGradleConfigurationProducer"/>
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestMethodGradleConfigurationProducer"/>