Fiddle with idea config.

- Stop it thinking "modules" is a valid module.
- Remove some paths that don't exist.
- Apply the auto-suggested gradle tweaks.
- Let it duplicate the VCS config lots, because it's quite insistent.

Change-Id: Ia8eb45562293fa6520e590e2bb1af3df470ce63d
Reviewed-on: http://gerrit.dmdirc.com/3914
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

.idea/gradle.xml

@@ -13,7 +13,6 @@
             <option value="$PROJECT_DIR$/modules/util" />
           </set>
         </option>
-        <option name="useAutoImport" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/modules.iml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$/modules" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="DMDirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/modules/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/modules/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/modules">
-      <sourceFolder url="file://$MODULE_DIR$/modules/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/modules" />
-      <excludeFolder url="file://$MODULE_DIR$/modules/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/modules/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit-4.12-beta-1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: mockito-all-1.9.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: hamcrest-core-1.3" level="project" />
-  </component>
-</module>
-

.idea/modules.xml

@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/DMDirc.iml" filepath="$PROJECT_DIR$/DMDirc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules.iml" filepath="$PROJECT_DIR$/.idea/modules.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/parser.iml" filepath="$PROJECT_DIR$/.idea/parser.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/plugins.iml" filepath="$PROJECT_DIR$/.idea/plugins.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/util.iml" filepath="$PROJECT_DIR$/.idea/util.iml" />

.idea/parser.iml

@@ -5,11 +5,8 @@
     <output-test url="file://$MODULE_DIR$/modules/parser/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/modules/parser">
-      <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/modules/parser/.gradle" />

.idea/plugins.iml

@@ -10,24 +10,18 @@
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/conditional_execute/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/conditional_execute/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/contactlist/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/contactlist/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcc/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcc/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcop/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcop/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/debug/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/debug/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dns/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dns/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/exec/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/identd/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/identd/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/lagdisplay/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/lagdisplay/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/logging/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/logging/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dbus/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dcop/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_linux_title/src" isTestSource="false" />

.idea/util.iml

@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$/modules/util" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="DMDirc.modules" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$/modules/util" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/modules/util/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/modules/util/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/modules/util">
-      <sourceFolder url="file://$MODULE_DIR$/modules/util/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/util/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/util/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/util/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/util/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/util/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/util/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/util/test-res" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/modules/util/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/modules/util/build" />
     </content>

.idea/vcs.xml

@@ -3,14 +3,26 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />
   </component>

DMDirc.iml

@@ -6,23 +6,12 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.clover" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/dist" />
-      <excludeFolder url="file://$MODULE_DIR$/gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/installer" />
-      <excludeFolder url="file://$MODULE_DIR$/junitreports" />
-      <excludeFolder url="file://$MODULE_DIR$/lib" />
-      <excludeFolder url="file://$MODULE_DIR$/nbproject" />
-      <excludeFolder url="file://$MODULE_DIR$/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/modules" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Sep 14 12:38:26 BST 2014
+#Mon Sep 15 11:05:29 BST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip