Merge pull request #135 from csmith/master

Tidy up gradle source sets.

build.gradle

@@ -19,20 +19,12 @@ subprojects {
 
     sourceSets {
         main {
-            java {
-                srcDir 'src'
-            }
-            resources {
-                srcDir 'res'
-            }
+            java.srcDirs = ['src']
+            resources.srcDirs = ['res']
         }
         test {
-            java {
-                srcDir 'test'
-            }
-            resources {
-                srcDir 'test-res'
-            }
+            java.srcDirs = ['test']
+            resources.srcDirs = ['test-res']
         }
     }