Fix bad type signature for android gradle plugin (fixes #370)

joelittlejohn · Jun 7, 2015 · 38b20e9 · 38b20e9
1 parent 4a7fd1a
commit 38b20e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/jsonschema2pojo-gradle-plugin/pom.xml b/jsonschema2pojo-gradle-plugin/pom.xml
@@ -59,11 +59,13 @@
     </dependencies>
 
     <build>
+        <sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/groovy</testSourceDirectory>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
-                <version>1.4</version>
+                <version>1.5</version>
                 <executions>
                     <execution>
                         <goals>
@@ -96,6 +98,11 @@
                     </includes>
                 </configuration>
               </plugin>
+              <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>codenarc-maven-plugin</artifactId>
+                  <version>0.22-1</version>
+              </plugin>
         </plugins>
     </build>
 </project>
diff --git a/...jo-gradle-plugin/src/main/groovy/org/jsonschema2pojo/gradle/GenerateJsonSchemaTask.groovy b/...jo-gradle-plugin/src/main/groovy/org/jsonschema2pojo/gradle/GenerateJsonSchemaTask.groovy
@@ -70,7 +70,7 @@ class GenerateJsonSchemaTask extends DefaultTask {
       variant.javaCompile.dependsOn(this)
     }
 
-    if (!configuration.sourceFiles.hasNext()) {
+    if (!configuration.sourceFiles.iterator().hasNext()) {
       configuration.sourceFiles = project.files(
         android.sourceSets.main.resources.srcDirs.collect { 
           "${it}/json"