IDEA/Gradle improvements

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

.gitignore

@@ -42,6 +42,7 @@ __history
 /test_profile
 /*.key
 /teamcity-info.xml
+/.idea/libraries
 /.idea/workspace.xml
 /.idea/uiDesigner.xml
 /atlassian-ide-plugin.xml

.idea/gradle.xml

@@ -3,7 +3,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="WRAPPED" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
@@ -13,6 +13,7 @@
             <option value="$PROJECT_DIR$/modules/util" />
           </set>
         </option>
+        <option name="useAutoImport" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/libraries/Gradle__dagger_1_2_1.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: dagger-1.2.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.dagger/dagger/1.2.1/78f96ef00fceee95802930944b1fc4e0e1f9aacc/dagger-1.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.dagger/dagger/1.2.1/9fdd555d386f8b904907df4e7a130fd3566538e0/dagger-1.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__dagger_compiler_1_2_1.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: dagger-compiler-1.2.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.dagger/dagger-compiler/1.2.1/c8bf6c2fda9b27f4d44a2aa4280df525a1408771/dagger-compiler-1.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.dagger/dagger-compiler/1.2.1/1a982b168909a7359057e2d308b404990aa282d8/dagger-compiler-1.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__guava_17_0.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: guava-17.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/17.0/9c6ef172e8de35fd8d4d8783e4821e57cdef7445/guava-17.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/17.0/7ca0efbeb87ca845b5d7a0ac9c21a4b7b95f7b28/guava-17.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__hamcrest_core_1_3.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: hamcrest-core-1.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__jackson_core_2_4_2.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: jackson-core-2.4.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.4.2/ceb72830d95c512b4b300a38f29febc85bdf6e4b/jackson-core-2.4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.4.2/52a95839309af730aaa84772ec60ef2e62c61f82/jackson-core-2.4.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__javawriter_2_3_0.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javawriter-2.3.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.3.0/4b290e394ea3109be5c0b7f08ff75de089125122/javawriter-2.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.3.0/4564886ebc503046560476943a6eb5f3235b28b9/javawriter-2.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__javax_inject_1.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.inject-1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/a00123f261762a7c5e0ec916a2c7c8298d29c400/javax.inject-1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__jsr305_2_0_3.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: jsr305-2.0.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.3/5871fb60dc68d67da54a663c3fd636a10a532948/jsr305-2.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.3/936f4430478909ed7b138d42f9ad73c919a87b26/jsr305-2.0.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__junit_4_12_beta_1.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: junit-4.12-beta-1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12-beta-1/f516376d8dbcaf37ab11975cd7807e5e1782a847/junit-4.12-beta-1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12-beta-1/6b1bbf7aedba23e3e43cb7afe0e9842c364065bd/junit-4.12-beta-1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__mbassador_1_1_10.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: mbassador-1.1.10">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.engio/mbassador/1.1.10/ca527ef1806b999b1efdc54ad62ec4984c59fefe/mbassador-1.1.10.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.engio/mbassador/1.1.10/8db6ab7025bba56190d9308852c626eda9ca412b/mbassador-1.1.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__migbase64_2_2.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: migbase64-2.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.brsanthu/migbase64/2.2/bcc14967d516e93c527897a6c531ba76b5751faa/migbase64-2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.brsanthu/migbase64/2.2/895a2b075d4d6241187cef465b42cd59963b0990/migbase64-2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__mockito_all_1_9_5.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: mockito-all-1.9.5">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-all/1.9.5/79a8984096fc6591c1e3690e07d41be506356fa5/mockito-all-1.9.5.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-all/1.9.5/b8086d4e4daa361fc746abea62f77a2ae55d3ed9/mockito-all-1.9.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__raven_4_2_1.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: raven-4.2.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kencochrane.raven/raven/4.2.1/3065e20a2824d820773663e31496508ad2bda2a6/raven-4.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kencochrane.raven/raven/4.2.1/209a81d1a1f750b9f4e692fe33e364076d6e9667/raven-4.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__slf4j_api_1_7_7.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: slf4j-api-1.7.7">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.7/2b8019b6249bb05d81d3a3094e468753e2b21311/slf4j-api-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.7/acd62e31cc314266e73eebed0b6dd7ea974a0ed/slf4j-api-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Gradle__yamlbeans_1_08.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: yamlbeans-1.08">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.esotericsoftware.yamlbeans/yamlbeans/1.08/c0d0301b03b3db563e4f9d7282fe0156a5cb98c0/yamlbeans-1.08.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.esotericsoftware.yamlbeans/yamlbeans/1.08/2f960c26938c00baa5413bb5016fc37ec2e15984/yamlbeans-1.08-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/modules.iml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" 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">
+<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$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <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$">
-      <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$" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
+    <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" />

DMDirc.iml

@@ -21,7 +21,6 @@
       <excludeFolder url="file://$MODULE_DIR$/installer" />
       <excludeFolder url="file://$MODULE_DIR$/junitreports" />
       <excludeFolder url="file://$MODULE_DIR$/lib" />
-      <excludeFolder url="file://$MODULE_DIR$/modules" />
       <excludeFolder url="file://$MODULE_DIR$/nbproject" />
       <excludeFolder url="file://$MODULE_DIR$/reports" />
     </content>