improve the way the processor is invoked

README.md

@@ -30,27 +30,10 @@ To use this library, add this to your build.gradle file:
           srcDir 'src/main/java'
         }
       }
-      gensrc {
-        java {
-          srcDir 'gen-src/main/java'
-        }
-      }
     }
 
-    compileJava {
-      doFirst {
-        // Directory should exists before compilation started.
-        generatedSourcesDir.mkdirs()
-      }
-      options.compilerArgs += [
-                           '-processor',
-                           'com.instagram.common.json.annotation.processor.JsonAnnotationProcessor',
-                           '-s',
-                           generatedSourcesDir
-      ]
-    }
     dependencies {
-      compile group: 'com.instagram', name: 'ig-json-parser-processor', version: '0.0.5+'
+      compile group: 'com.instagram', name: 'ig-json-parser-processor', version: '0.0.6+'
     }
 
 

build.gradle

@@ -15,6 +15,7 @@ task processorJar(type: Jar,
     from files( { project(':common').sourceSets.main.output.classesDir } )
     from files( { project(':util').sourceSets.main.output.classesDir } )
     from files( { project(':processor').sourceSets.main.output.classesDir } )
+    from files( { project(':processor').sourceSets.main.output.resourcesDir } )
     baseName 'processor'
 }
 
@@ -27,20 +28,20 @@ task runtimeJar(type: Jar,
 task runtimeSourcesJar(type: Jar) {
     classifier = 'sources'
     baseName 'runtime'
-    from files( { project(':common').sourceSets.main.allSource } )
+    from files( { project(':common').sourceSets.main.allJava } )
 }
 
 task processorSourcesJar(type: Jar) {
     classifier = 'sources'
     baseName 'processor'
-    from files( { project(':javawriter').sourceSets.main.allSource } )
-    from files( { project(':common').sourceSets.main.allSource } )
-    from files( { project(':util').sourceSets.main.allSource } )
-    from files( { project(':processor').sourceSets.main.allSource } )
+    from files( { project(':javawriter').sourceSets.main.allJava } )
+    from files( { project(':common').sourceSets.main.allJava } )
+    from files( { project(':util').sourceSets.main.allJava } )
+    from files( { project(':processor').sourceSets.main.allJava } )
 }
 
 task runtimeJavadoc(type: Javadoc) {
-    source files( { project(':common').sourceSets.main.allSource } )
+    source files( { project(':common').sourceSets.main.allJava } )
     destinationDir = new File("${project.docsDir}", "runtime-javadoc")
 }
 
@@ -51,10 +52,10 @@ task runtimeJavadocJar(type: Jar, dependsOn: runtimeJavadoc) {
 }
 
 task processorJavadoc(type: Javadoc) {
-    source files( { project(':javawriter').sourceSets.main.allSource } )
-    source files( { project(':common').sourceSets.main.allSource } )
-    source files( { project(':util').sourceSets.main.allSource } )
-    source files( { project(':processor').sourceSets.main.allSource } )
+    source files( { project(':javawriter').sourceSets.main.allJava } )
+    source files( { project(':common').sourceSets.main.allJava } )
+    source files( { project(':util').sourceSets.main.allJava } )
+    source files( { project(':processor').sourceSets.main.allJava } )
     destinationDir = new File("${project.docsDir}", "processor-javadoc")
 }
 

maven-example/build.gradle

@@ -3,10 +3,6 @@ apply plugin: 'java'
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
-ext {
-  generatedSourcesDir = file("gen-src/main/java")
-}
-
 repositories {
   mavenCentral()
 }
@@ -17,25 +13,8 @@ sourceSets {
       srcDir 'src/main/java'
     }
   }
-  gensrc {
-    java {
-      srcDir 'gen-src/main/java'
-    }
-  }
 }
 
-compileJava {
-  doFirst {
-    // Directory should exists before compilation started.
-    generatedSourcesDir.mkdirs()
-  }
-  options.compilerArgs += [
-                       '-processor',
-                       'com.instagram.common.json.annotation.processor.JsonAnnotationProcessor',
-                       '-s',
-                       generatedSourcesDir
-  ]
-}
 dependencies {
-  compile group: 'com.instagram', name: 'ig-json-parser-processor', version: '0.0.3+'
+  compile group: 'com.instagram', name: 'ig-json-parser-processor', version: '0.0.6+'
 }

processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -0,0 +1 @@
+com.instagram.common.json.annotation.processor.JsonAnnotationProcessor