From ba9b3397d04344086166b5819585c0f04890589f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 27 Mar 2019 18:05:49 +0300
Subject: [PATCH] Make Groovy-based inspections alive again

After commit 9b5b0447, declaration of Groovy-based inspections moved
into gradle-groovy.xml. However, this makes transitive-optional
dependency between plugin.xml, gradle-java.xml & gradle-groovy.xml
which doesn't work (see IDEA-209769) and inspections aren't loaded.

This commit breaks this transitivity by declaring dependency
to gradle-groovy.xml directly in plugin.xml.
This also fixes most tests from GradleInspectionTest group.
---
 idea/resources/META-INF/gradle-java.xml      | 1 -
 idea/resources/META-INF/gradle-java.xml.191  | 1 -
 idea/resources/META-INF/gradle-java.xml.as33 | 1 -
 idea/resources/META-INF/gradle-java.xml.as34 | 1 -
 idea/resources/META-INF/plugin.xml           | 1 +
 idea/resources/META-INF/plugin.xml.182       | 1 +
 idea/resources/META-INF/plugin.xml.191       | 1 +
 idea/resources/META-INF/plugin.xml.as33      | 1 +
 idea/resources/META-INF/plugin.xml.as34      | 1 +
 idea/resources/META-INF/plugin.xml.as35      | 1 +
 10 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/idea/resources/META-INF/gradle-java.xml b/idea/resources/META-INF/gradle-java.xml
index 5bed7f459b6..99bc48b12fa 100644
--- a/idea/resources/META-INF/gradle-java.xml
+++ b/idea/resources/META-INF/gradle-java.xml
@@ -1,5 +1,4 @@
 <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"/>
diff --git a/idea/resources/META-INF/gradle-java.xml.191 b/idea/resources/META-INF/gradle-java.xml.191
index 6a056125f57..65b39b0eae4 100644
--- a/idea/resources/META-INF/gradle-java.xml.191
+++ b/idea/resources/META-INF/gradle-java.xml.191
@@ -1,5 +1,4 @@
 <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"/>
diff --git a/idea/resources/META-INF/gradle-java.xml.as33 b/idea/resources/META-INF/gradle-java.xml.as33
index 6a056125f57..65b39b0eae4 100644
--- a/idea/resources/META-INF/gradle-java.xml.as33
+++ b/idea/resources/META-INF/gradle-java.xml.as33
@@ -1,5 +1,4 @@
 <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"/>
diff --git a/idea/resources/META-INF/gradle-java.xml.as34 b/idea/resources/META-INF/gradle-java.xml.as34
index 6a056125f57..65b39b0eae4 100644
--- a/idea/resources/META-INF/gradle-java.xml.as34
+++ b/idea/resources/META-INF/gradle-java.xml.as34
@@ -1,5 +1,4 @@
 <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"/>
diff --git a/idea/resources/META-INF/plugin.xml b/idea/resources/META-INF/plugin.xml
index 1f62b087db2..46a859286ca 100644
--- a/idea/resources/META-INF/plugin.xml
+++ b/idea/resources/META-INF/plugin.xml
@@ -23,6 +23,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
   <depends optional="true" config-file="gradle-java.xml">org.jetbrains.plugins.gradle.java</depends>
+  <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</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="android.xml">org.jetbrains.android</depends>
diff --git a/idea/resources/META-INF/plugin.xml.182 b/idea/resources/META-INF/plugin.xml.182
index 82fcab1eeeb..d7156942ade 100644
--- a/idea/resources/META-INF/plugin.xml.182
+++ b/idea/resources/META-INF/plugin.xml.182
@@ -23,6 +23,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
   <depends optional="true" config-file="gradle-java.xml">org.jetbrains.plugins.gradle.java</depends>
+  <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</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="android.xml">org.jetbrains.android</depends>
diff --git a/idea/resources/META-INF/plugin.xml.191 b/idea/resources/META-INF/plugin.xml.191
index 8ba8180a853..82a7ec95bef 100644
--- a/idea/resources/META-INF/plugin.xml.191
+++ b/idea/resources/META-INF/plugin.xml.191
@@ -23,6 +23,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
   <depends optional="true" config-file="gradle-java.xml">org.jetbrains.plugins.gradle.java</depends>
+  <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</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>
diff --git a/idea/resources/META-INF/plugin.xml.as33 b/idea/resources/META-INF/plugin.xml.as33
index 38628b1d8d0..e7ddd8a0989 100644
--- a/idea/resources/META-INF/plugin.xml.as33
+++ b/idea/resources/META-INF/plugin.xml.as33
@@ -24,6 +24,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
   <depends optional="true" config-file="gradle-java.xml">org.jetbrains.plugins.gradle.java</depends>
+  <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</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="kotlin-copyright.xml">com.intellij.copyright</depends>
diff --git a/idea/resources/META-INF/plugin.xml.as34 b/idea/resources/META-INF/plugin.xml.as34
index 7940be45b38..ab06e61fec6 100644
--- a/idea/resources/META-INF/plugin.xml.as34
+++ b/idea/resources/META-INF/plugin.xml.as34
@@ -24,6 +24,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
   <depends optional="true" config-file="gradle-java.xml">org.jetbrains.plugins.gradle.java</depends>
+  <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</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="kotlin-copyright.xml">com.intellij.copyright</depends>
diff --git a/idea/resources/META-INF/plugin.xml.as35 b/idea/resources/META-INF/plugin.xml.as35
index e71bcf9adc2..5efd53a8e8a 100644
--- a/idea/resources/META-INF/plugin.xml.as35
+++ b/idea/resources/META-INF/plugin.xml.as35
@@ -24,6 +24,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
   <depends optional="true" config-file="gradle-java.xml">org.jetbrains.plugins.gradle.java</depends>
+  <depends optional="true" config-file="gradle-groovy.xml">org.intellij.groovy</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="kotlin-copyright.xml">com.intellij.copyright</depends>