Android support fixes

README.md

@@ -201,7 +201,7 @@ slice {
      }
      set2 {
        include = ["${projectDir}"]
-       files = filetree(dir: "b", includes: ['**.ice'])
+       files = fileTree(dir: "b", includes: ['**.ice'])
      }
   }
 }

build.gradle

@@ -63,7 +63,7 @@ sourceSets {
     }
 }
 
-version  = "1.4.0"
+version  = "1.4.1"
 group = "com.zeroc.gradle.ice-builder"
 
 if(!localOnly.toBoolean()) {

src/main/groovy/com/zeroc/gradle/icebuilder/slice/SlicePlugin.groovy

@@ -35,22 +35,13 @@ class SlicePlugin implements Plugin<Project> {
             LOGGER.debug("Detected Android project: ${project}. Delaying applying task until project is evaluated")
             project.afterEvaluate {
                 getAndroidVariants(project).all { variant ->
-                    variant.javaCompiler.dependsOn('compileSlice')
+                    variant.registerJavaGeneratingTask(project.tasks.getByName('compileSlice'), project.slice.output)
                 }
-                project.android.testVariants.all { variant ->
-                    variant.javaCompiler.dependsOn('compileSlice')
-                }
-                project.android.sourceSets.main.java.srcDir project.slice.output
             }
         } else {
-            try {
-                project.tasks.getByName("compileJava").dependsOn('compileSlice');
-                project.sourceSets.main.java.srcDir project.slice.output
-            } catch(UnknownTaskException ex)  {
-                LOGGER.error("No compileJava task was found for project: ${project}")
-            }
+            project.tasks.getByName("compileJava").dependsOn('compileSlice');
+            project.sourceSets.main.java.srcDir project.slice.output
         }
-
     }
 
     def isAndroidProject(Project project) {