More gradle/idea fiddling.

Force project name to 'dmdirc'. Think this was the cause of all
the nonsense.

Also add plugins in the root project, so gradle knows about all
of them (for tests etc).

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

.idea/gradle.xml

@@ -10,6 +10,7 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/modules" />
             <option value="$PROJECT_DIR$/modules/parser" />
+            <option value="$PROJECT_DIR$/modules/plugins" />
             <option value="$PROJECT_DIR$/modules/util" />
           </set>
         </option>

.idea/plugins.iml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="plugins" external.linked.project.path="$MODULE_DIR$/modules/plugins" external.root.project.path="$MODULE_DIR$/modules/plugins" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <output url="file://$MODULE_DIR$/modules/plugins/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/modules/plugins/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/modules/plugins">
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/.gradle" />
@@ -11,42 +13,9 @@
     <orderEntry type="module" module-name="dmdirc" />
     <orderEntry type="module" module-name="parser" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/modules/plugins/lib/main" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/modules/plugins/lib/main" />
-        </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/modules/plugins/lib/main" recursive="false" />
-        <jarDirectory url="file://$MODULE_DIR$/modules/plugins/lib/main" recursive="false" type="SOURCES" />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/modules/plugins/lib/test" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/modules/plugins/lib/test" />
-        </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/modules/plugins/lib/test" recursive="false" />
-        <jarDirectory url="file://$MODULE_DIR$/modules/plugins/lib/test" recursive="false" type="SOURCES" />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/lib/bundled" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/lib/bundled" recursive="false" />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>
 

settings.gradle

@@ -1,2 +1,5 @@
+rootProject.name = 'dmdirc'
+
 include 'modules:util'
 include 'modules:parser'
+include 'modules:plugins'