From 3895d5a1ddba66296043c881891f42154d0435f1 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <alexander.zolotov@jetbrains.com>
Date: Sat, 29 Apr 2017 14:21:49 +0300
Subject: [PATCH] Fix ultimate project structure tests

---
 build/dependencies/buildSrc/build.gradle      |  6 +++++
 build/dependencies/buildSrc/buildSrc.iml      | 22 +++++++++----------
 .../buildSrc/src/main/java/doNotDelete.txt    |  1 +
 .../src/main/resources/doNotDelete.txt        |  1 +
 .../buildSrc/src/test/groovy/doNotDelete.txt  |  1 +
 .../buildSrc/src/test/java/doNotDelete.txt    |  1 +
 .../src/test/resources/doNotDelete.txt        |  1 +
 7 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 build/dependencies/buildSrc/build.gradle
 create mode 100644 build/dependencies/buildSrc/src/main/java/doNotDelete.txt
 create mode 100644 build/dependencies/buildSrc/src/main/resources/doNotDelete.txt
 create mode 100644 build/dependencies/buildSrc/src/test/groovy/doNotDelete.txt
 create mode 100644 build/dependencies/buildSrc/src/test/java/doNotDelete.txt
 create mode 100644 build/dependencies/buildSrc/src/test/resources/doNotDelete.txt

diff --git a/build/dependencies/buildSrc/build.gradle b/build/dependencies/buildSrc/build.gradle
new file mode 100644
index 000000000000..b0946a5eeb84
--- /dev/null
+++ b/build/dependencies/buildSrc/build.gradle
@@ -0,0 +1,6 @@
+apply plugin: 'idea'
+idea {
+  module {
+    inheritOutputDirs true
+  }
+}
\ No newline at end of file
diff --git a/build/dependencies/buildSrc/buildSrc.iml b/build/dependencies/buildSrc/buildSrc.iml
index eb8f74b18393..bac8a4f1f063 100644
--- a/build/dependencies/buildSrc/buildSrc.iml
+++ b/build/dependencies/buildSrc/buildSrc.iml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="buildSrc" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/groovy" isTestSource="false" />
@@ -25,15 +23,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: groovy-all-2.4.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14-all/t7wfomcrmv8dmyii9c9waem8/gradle-2.14/lib/groovy-all-2.4.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-installation-beacon-2.14">
         <CLASSES>
@@ -45,5 +34,14 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: groovy-all-2.4.4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14-all/t7wfomcrmv8dmyii9c9waem8/gradle-2.14/lib/groovy-all-2.4.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/build/dependencies/buildSrc/src/main/java/doNotDelete.txt b/build/dependencies/buildSrc/src/main/java/doNotDelete.txt
new file mode 100644
index 000000000000..149d0f8efa1a
--- /dev/null
+++ b/build/dependencies/buildSrc/src/main/java/doNotDelete.txt
@@ -0,0 +1 @@
+The java dir is needed for IdeaUltimateProjectStructureTest
\ No newline at end of file
diff --git a/build/dependencies/buildSrc/src/main/resources/doNotDelete.txt b/build/dependencies/buildSrc/src/main/resources/doNotDelete.txt
new file mode 100644
index 000000000000..149d0f8efa1a
--- /dev/null
+++ b/build/dependencies/buildSrc/src/main/resources/doNotDelete.txt
@@ -0,0 +1 @@
+The java dir is needed for IdeaUltimateProjectStructureTest
\ No newline at end of file
diff --git a/build/dependencies/buildSrc/src/test/groovy/doNotDelete.txt b/build/dependencies/buildSrc/src/test/groovy/doNotDelete.txt
new file mode 100644
index 000000000000..149d0f8efa1a
--- /dev/null
+++ b/build/dependencies/buildSrc/src/test/groovy/doNotDelete.txt
@@ -0,0 +1 @@
+The java dir is needed for IdeaUltimateProjectStructureTest
\ No newline at end of file
diff --git a/build/dependencies/buildSrc/src/test/java/doNotDelete.txt b/build/dependencies/buildSrc/src/test/java/doNotDelete.txt
new file mode 100644
index 000000000000..149d0f8efa1a
--- /dev/null
+++ b/build/dependencies/buildSrc/src/test/java/doNotDelete.txt
@@ -0,0 +1 @@
+The java dir is needed for IdeaUltimateProjectStructureTest
\ No newline at end of file
diff --git a/build/dependencies/buildSrc/src/test/resources/doNotDelete.txt b/build/dependencies/buildSrc/src/test/resources/doNotDelete.txt
new file mode 100644
index 000000000000..149d0f8efa1a
--- /dev/null
+++ b/build/dependencies/buildSrc/src/test/resources/doNotDelete.txt
@@ -0,0 +1 @@
+The java dir is needed for IdeaUltimateProjectStructureTest
\ No newline at end of file