From e0bf4381959ca705510bf957bf56a37f51c719ba Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 31 Aug 2017 17:56:14 +0200
Subject: [PATCH] Move .xml files back to main idea module

---
 idea/{idea-android => }/src/META-INF/android.xml | 0
 idea/{idea-jvm => }/src/META-INF/coverage.xml    | 0
 idea/{idea-jvm => }/src/META-INF/decompiler.xml  | 0
 idea/{idea-gradle => }/src/META-INF/gradle.xml   | 2 +-
 idea/{idea-jvm => }/src/META-INF/junit.xml       | 0
 idea/{idea-maven => }/src/META-INF/maven.xml     | 0
 idea/{idea-jvm => }/src/META-INF/testng-j.xml    | 0
 7 files changed, 1 insertion(+), 1 deletion(-)
 rename idea/{idea-android => }/src/META-INF/android.xml (100%)
 rename idea/{idea-jvm => }/src/META-INF/coverage.xml (100%)
 rename idea/{idea-jvm => }/src/META-INF/decompiler.xml (100%)
 rename idea/{idea-gradle => }/src/META-INF/gradle.xml (99%)
 rename idea/{idea-jvm => }/src/META-INF/junit.xml (100%)
 rename idea/{idea-maven => }/src/META-INF/maven.xml (100%)
 rename idea/{idea-jvm => }/src/META-INF/testng-j.xml (100%)

diff --git a/idea/idea-android/src/META-INF/android.xml b/idea/src/META-INF/android.xml
similarity index 100%
rename from idea/idea-android/src/META-INF/android.xml
rename to idea/src/META-INF/android.xml
diff --git a/idea/idea-jvm/src/META-INF/coverage.xml b/idea/src/META-INF/coverage.xml
similarity index 100%
rename from idea/idea-jvm/src/META-INF/coverage.xml
rename to idea/src/META-INF/coverage.xml
diff --git a/idea/idea-jvm/src/META-INF/decompiler.xml b/idea/src/META-INF/decompiler.xml
similarity index 100%
rename from idea/idea-jvm/src/META-INF/decompiler.xml
rename to idea/src/META-INF/decompiler.xml
diff --git a/idea/idea-gradle/src/META-INF/gradle.xml b/idea/src/META-INF/gradle.xml
similarity index 99%
rename from idea/idea-gradle/src/META-INF/gradle.xml
rename to idea/src/META-INF/gradle.xml
index 2167d14243c..f1ad75aeca2 100644
--- a/idea/idea-gradle/src/META-INF/gradle.xml
+++ b/idea/src/META-INF/gradle.xml
@@ -23,7 +23,7 @@
             enabledByDefault="true"
             language="Groovy"
             hasStaticDescription="true"
-            level="WARNING"/>
+            level="WARNING"/>1
 
         <localInspection
             implementationClass="org.jetbrains.kotlin.idea.inspections.gradle.DifferentStdlibGradleVersionInspection"
diff --git a/idea/idea-jvm/src/META-INF/junit.xml b/idea/src/META-INF/junit.xml
similarity index 100%
rename from idea/idea-jvm/src/META-INF/junit.xml
rename to idea/src/META-INF/junit.xml
diff --git a/idea/idea-maven/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml
similarity index 100%
rename from idea/idea-maven/src/META-INF/maven.xml
rename to idea/src/META-INF/maven.xml
diff --git a/idea/idea-jvm/src/META-INF/testng-j.xml b/idea/src/META-INF/testng-j.xml
similarity index 100%
rename from idea/idea-jvm/src/META-INF/testng-j.xml
rename to idea/src/META-INF/testng-j.xml