Merge pull request #694 from csmith/master

Restructure to standard maven/gradle layout.

.gitignore

@@ -1,10 +1,13 @@
 # DMDirc .gitignore file
 /build
-/generated
 /dist
 /lib
 /etc/clover.license
 /etc/clover/clover.license
 /.clover
 /*.key
-/.gradle
+/.gradle
+
+# Generated files created by IDEA
+/src/*/generated
+/src/*/generated_tests

build.gradle

@@ -12,9 +12,9 @@ group = 'com.dmdirc'
 
 idea {
     module {
-         sourceDirs = [file('src'), file('generated')]
-         testSourceDirs = [file('test'), file('generated_tests')]
-         generatedSourceDirs = [file('generated'), file('generated_tests')]
+         sourceDirs += file('src/main/generated')
+         testSourceDirs += file('src/test/generated_tests')
+         generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
     }
 }
 
@@ -52,17 +52,6 @@ dependencies {
     testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.1'
 }
 
-sourceSets {
-    main {
-        java.srcDirs = ['src']
-        resources.srcDirs = ['res']
-    }
-    test {
-        java.srcDirs = ['test']
-        resources.srcDirs = ['test-res']
-    }
-}
-
 sourceCompatibility = 1.8
 targetCompatibility = 1.8