Use old API methods for task inputs and outputs

Will revert deprecation in next commit.

+review REVIEW-6038

subprojects/core/src/integTest/groovy/org/gradle/api/internal/changedetection/state/InMemoryTaskArtifactsIntegrationTest.groovy

@@ -27,7 +27,7 @@ class InMemoryTaskArtifactsIntegrationTest extends DaemonIntegrationSpec {
 task someTask {
     inputs.property "someEnum", SomeEnum.E1
     def f = new File("build/e1")
-    outputs.includeDir f
+    outputs.dir f
     doLast {
         f.mkdirs()
     }

subprojects/core/src/integTest/groovy/org/gradle/api/internal/tasks/execution/InputOutputEnsuringTaskExecuterIntegrationTest.groovy

@@ -27,13 +27,13 @@ class InputOutputEnsuringTaskExecuterIntegrationTest extends AbstractIntegration
                     it.configure {
                         println "Inputs are configured via nested configure()"
                     }
-                    it.includeFile("input.txt")
+                    it.file("input.txt")
                 }
                 outputs.configure {
                     it.configure {
                         println "Outputs are configured via nested configure()"
                     }
-                    it.includeFile("output.txt")
+                    it.file("output.txt")
                 }
                 doLast {
                     file("output.txt") << file("input.txt")

subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CopyTaskIntegrationSpec.groovy

@@ -367,13 +367,13 @@ class CopyTaskIntegrationSpec extends AbstractIntegrationSpec {
             configurations { compile }
             dependencies { compile files('a.jar') }
             task fileProducer {
-                outputs.includeFile 'build/out.txt'
+                outputs.file 'build/out.txt'
                 doLast {
                     file('build/out.txt').text = 'some content'
                 }
             }
             task dirProducer {
-                outputs.includeDir 'build/outdir'
+                outputs.dir 'build/outdir'
                 doLast {
                     file('build/outdir').mkdirs()
                     file('build/outdir/file1.txt').text = 'some content'
@@ -404,13 +404,13 @@ class CopyTaskIntegrationSpec extends AbstractIntegrationSpec {
             configurations { compile }
             dependencies { compile files('a.jar') }
             task fileProducer {
-                outputs.includeFile 'build/out.txt'
+                outputs.file 'build/out.txt'
                 doLast {
                     file('build/out.txt').text = 'some content'
                 }
             }
             task dirProducer {
-                outputs.includeDir 'build/outdir'
+                outputs.dir 'build/outdir'
                 doLast {
                     file('build/outdir').mkdirs()
                     file('build/outdir/file1.txt').text = 'some content'

subprojects/core/src/integTest/groovy/org/gradle/api/tasks/FailingIncrementalTasksIntegrationTest.groovy

@@ -23,7 +23,7 @@ class FailingIncrementalTasksIntegrationTest extends AbstractIntegrationSpec {
     def "consecutively failing task has correct up-to-date status and failure"() {
         buildFile << """
             task foo {
-                outputs.includeFile("out.txt")
+                outputs.file("out.txt")
                 doLast {
                     if (project.file("out.txt").exists()) {
                         throw new RuntimeException("Boo!")

subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalBuildIntegrationTest.groovy

@@ -398,15 +398,15 @@ task b(type: DirTransformerTask) {
     public void canUseUpToDatePredicateToForceTaskToExecute() {
         testFile('build.gradle') << '''
 task inputsAndOutputs {
-    inputs.includeFiles 'src.txt'
-    outputs.includeFile 'src.a.txt'
+    inputs.files 'src.txt'
+    outputs.file 'src.a.txt'
     outputs.upToDateWhen { project.hasProperty('uptodate') }
     doFirst {
         outputs.files.singleFile.text = "[${inputs.files.singleFile.text}]"
     }
 }
 task noOutputs {
-    inputs.includeFile 'src.txt'
+    inputs.file 'src.txt'
     outputs.upToDateWhen { project.hasProperty('uptodate') }
     doFirst { }
 }

subprojects/core/src/integTest/resources/org/gradle/api/resource/TextResourceIntegrationTest/shared/build.gradle

@@ -12,7 +12,7 @@ class MyTask extends DefaultTask {
 }
 
 task generateConfigFile {
-    outputs.includeFile "config.txt"
+    outputs.file "config.txt"
     doLast {
         file("config.txt").text = "my config"
     }

subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/InputDirectoryPropertyAnnotationHandler.java

@@ -46,7 +46,7 @@ public boolean attachActions(final TaskPropertyActionContext context) {
         final boolean skipWhenEmpty = context.isAnnotationPresent(SkipWhenEmpty.class);
         context.setConfigureAction(new UpdateAction() {
             public void update(TaskInternal task, Callable<Object> futureValue) {
-                task.getInputs().includeDir(futureValue).withPropertyName(context.getName()).skipWhenEmpty(skipWhenEmpty);
+                task.getInputs().dir(futureValue).withPropertyName(context.getName()).skipWhenEmpty(skipWhenEmpty);
             }
         });
         return true;

subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/InputFilePropertyAnnotationHandler.java

@@ -43,7 +43,7 @@ public boolean attachActions(final TaskPropertyActionContext context) {
         context.setValidationAction(inputFileValidation);
         context.setConfigureAction(new UpdateAction() {
             public void update(TaskInternal task, Callable<Object> futureValue) {
-                task.getInputs().includeFiles(futureValue).withPropertyName(context.getName());
+                task.getInputs().files(futureValue).withPropertyName(context.getName());
             }
         });
         return true;

subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/InputFilesPropertyAnnotationHandler.java

@@ -31,7 +31,7 @@ public boolean attachActions(final TaskPropertyActionContext context) {
         final boolean skipWhenEmpty = context.isAnnotationPresent(SkipWhenEmpty.class);
         context.setConfigureAction(new UpdateAction() {
             public void update(TaskInternal task, Callable<Object> futureValue) {
-                task.getInputs().includeFiles(futureValue).withPropertyName(context.getName()).skipWhenEmpty(skipWhenEmpty);
+                task.getInputs().files(futureValue).withPropertyName(context.getName()).skipWhenEmpty(skipWhenEmpty);
             }
         });
         return true;

subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputDirectoriesPropertyAnnotationHandler.java

@@ -68,7 +68,7 @@ public void execute(TaskOutputs taskOutputs) {
                 if (directories != null) {
                     int counter = 0;
                     for (File directory : directories) {
-                        taskOutputs.includeDir(directory).withPropertyName(context.getName() + "$" + (++counter));
+                        taskOutputs.dir(directory).withPropertyName(context.getName() + "$" + (++counter));
                     }
                 }
             }

subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputDirectoryPropertyAnnotationHandler.java

@@ -45,7 +45,7 @@ protected void validate(String propertyName, Object value, Collection<String> me
 
     @Override
     protected void update(TaskPropertyActionContext context, TaskInternal task, final Callable<Object> futureValue) {
-        task.getOutputs().includeDir(futureValue).withPropertyName(context.getName());
+        task.getOutputs().dir(futureValue).withPropertyName(context.getName());
         task.prependParallelSafeAction(new Action<Task>() {
             public void execute(Task task) {
                 File directory = uncheckedCast(uncheckedCall(futureValue));

subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputFilePropertyAnnotationHandler.java

@@ -42,7 +42,7 @@ protected void validate(String propertyName, Object value, Collection<String> me
 
     @Override
     protected void update(TaskPropertyActionContext context, TaskInternal task, final Callable<Object> futureValue) {
-        task.getOutputs().includeFile(futureValue).withPropertyName(context.getName());
+        task.getOutputs().file(futureValue).withPropertyName(context.getName());
         task.prependParallelSafeAction(new Action<Task>() {
             public void execute(Task task) {
                 File file = (File) uncheckedCall(futureValue);

subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputFilesPropertyAnnotationHandler.java

@@ -69,7 +69,7 @@ public void execute(TaskOutputs taskOutputs) {
                 if (files != null) {
                     int counter = 0;
                     for (File file : files) {
-                        taskOutputs.includeFile(file).withPropertyName(context.getName() + "$" + (++counter));
+                        taskOutputs.file(file).withPropertyName(context.getName() + "$" + (++counter));
                     }
                 }
             }

subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/changes/DefaultTaskArtifactStateRepositoryTest.groovy

@@ -703,13 +703,13 @@ public class DefaultTaskArtifactStateRepositoryTest extends Specification {
         TaskInternal task() {
             final TaskInternal task = TestUtil.createTask(type, project, path)
             if (inputs != null) {
-                task.getInputs().includeFiles(inputs)
+                task.getInputs().files(inputs)
             }
             if (inputProperties != null) {
                 task.getInputs().properties(inputProperties)
             }
             if (outputs != null) {
-                outputs.each { task.getOutputs().includeFile(it) }
+                outputs.each { task.getOutputs().file(it) }
             }
             task.doLast(new org.gradle.api.Action<Object>() {
                 public void execute(Object o) {

subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/DefaultTaskInputsTest.groovy

@@ -53,64 +53,48 @@ class DefaultTaskInputsTest extends Specification {
         inputs.sourceFiles.empty
     }
 
-    def canRegisterInputFiles() {
-        when:
-        inputs.files('a')
-
-        then:
-        inputs.files.files == [new File('a')] as Set
-    }
-
-    def canRegisterInputDir() {
-        when:
-        inputs.dir('a')
-
-        then:
-        inputs.files.files == [treeFile] as Set
-    }
-
     def "can register input file"() {
-        when: inputs.includeFile("a")
+        when: inputs.file("a")
         then:
         inputs.files.files.toList() == [new File('a')]
         inputs.fileProperties*.propertyName.toList() == ['$1']
         inputs.fileProperties*.propertyFiles*.files.flatten() == [new File("a")]
     }
 
     def "can register input file with property name"() {
-        when: inputs.includeFile("a").withPropertyName("prop")
+        when: inputs.file("a").withPropertyName("prop")
         then:
         inputs.files.files.toList() == [new File('a')]
         inputs.fileProperties*.propertyName.toList() == ['prop']
         inputs.fileProperties*.propertyFiles*.files.flatten() == [new File("a")]
     }
 
     def "can register input files"() {
-        when: inputs.includeFiles("a", "b")
+        when: inputs.files("a", "b")
         then:
         inputs.files.files.toList() == [new File("a"), new File("b")]
         inputs.fileProperties*.propertyName == ['$1']
         inputs.fileProperties*.propertyFiles*.files.flatten() == [new File("a"), new File("b")]
     }
 
     def "can register input files with property naem"() {
-        when: inputs.includeFiles("a", "b").withPropertyName("prop")
+        when: inputs.files("a", "b").withPropertyName("prop")
         then:
         inputs.files.files.sort() == [new File("a"), new File("b")]
         inputs.fileProperties*.propertyName == ['prop']
         inputs.fileProperties*.propertyFiles*.files.flatten() == [new File("a"), new File("b")]
     }
 
     def "can register input dir"() {
-        when: inputs.includeDir("a")
+        when: inputs.dir("a")
         then:
         inputs.files.files.toList() == [treeFile]
         inputs.fileProperties*.propertyName == ['$1']
         inputs.fileProperties*.propertyFiles*.files.flatten() == [treeFile]
     }
 
     def "can register input dir with property name"() {
-        when: inputs.includeDir("a").withPropertyName("prop")
+        when: inputs.dir("a").withPropertyName("prop")
         then:
         inputs.files.files.toList() == [treeFile]
         inputs.fileProperties*.propertyName == ['prop']
@@ -177,12 +161,12 @@ class DefaultTaskInputsTest extends Specification {
     }
 
     def "can register source files"() {
-        when: inputs.includeFiles("a", "b").withPropertyName("prop")
+        when: inputs.files("a", "b").withPropertyName("prop")
         then:
         inputs.hasInputs
         !inputs.hasSourceFiles
 
-        when: inputs.includeFiles(["s1", "s2"]).skipWhenEmpty()
+        when: inputs.files(["s1", "s2"]).skipWhenEmpty()
         then:
         inputs.hasSourceFiles
         inputs.files.files.toList() == [new File("a"), new File("b"), new File("s1"), new File("s2")]

subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/DefaultTaskOutputsTest.groovy

@@ -55,31 +55,31 @@ class DefaultTaskOutputsTest extends Specification {
     }
 
     def "can register output file"() {
-        when: outputs.includeFile("a")
+        when: outputs.file("a")
         then:
         outputs.files.files.toList() == [new File('a')]
         outputs.fileProperties*.propertyName.toList() == ['$1']
         outputs.fileProperties*.propertyFiles*.files.flatten() == [new File("a")]
     }
 
     def "can register output file with property name"() {
-        when: outputs.includeFile("a").withPropertyName("prop")
+        when: outputs.file("a").withPropertyName("prop")
         then:
         outputs.files.files.toList() == [new File('a')]
         outputs.fileProperties*.propertyName.toList() == ['prop']
         outputs.fileProperties*.propertyFiles*.files.flatten() == [new File("a")]
     }
 
     def "can register output dir"() {
-        when: outputs.includeDir("a")
+        when: outputs.file("a")
         then:
         outputs.files.files.toList() == [new File('a')]
         outputs.fileProperties*.propertyName.toList() == ['$1']
         outputs.fileProperties*.propertyFiles*.files.flatten() == [new File("a")]
     }
 
     def "can register output dir with property name"() {
-        when: outputs.includeDir("a").withPropertyName("prop")
+        when: outputs.dir("a").withPropertyName("prop")
         then:
         outputs.files.files.toList() == [new File('a')]
         outputs.fileProperties*.propertyName.toList() == ['prop']

subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ProjectDependencyResolveIntegrationTest.groovy

@@ -350,7 +350,7 @@ project(":b") {
     configurations { compile }
     dependencies { compile(project(':a')) { artifact { name = 'y'; type = 'jar' } } }
     task test {
-        inputs.includeFiles configurations.compile
+        inputs.files configurations.compile
         doFirst {
             assert configurations.compile.files.collect { it.name } == ['y.jar', 'externalA-1.5.jar']
         }
@@ -382,7 +382,7 @@ project(":b") {
     configurations { compile }
     dependencies { compile(project(':a')) { artifact { name = 'b'; type = 'jar' } } }
     task test {
-        inputs.includeFiles configurations.compile
+        inputs.files configurations.compile
         doFirst {
             assert configurations.compile.files.collect { it.name } == ['a-b.jar', 'externalA-1.5.jar']
         }

subprojects/docs/src/samples/application/build.gradle

@@ -16,7 +16,7 @@ applicationDefaultJvmArgs = ["-Dgreeting.language=en"]
 // START SNIPPET distribution-spec
 task createDocs {
     def docs = file("$buildDir/docs")
-    outputs.includeDir docs
+    outputs.dir docs
     doLast {
         docs.mkdirs()
         new File(docs, "readme.txt").write("Read me!")

subprojects/docs/src/samples/testKit/gradleRunner/manualClasspathInjection/build.gradle

@@ -18,8 +18,8 @@ repositories {
 task createClasspathManifest {
     def outputDir = file("$buildDir/$name")
 
-    inputs.includeFiles sourceSets.main.runtimeClasspath
-    outputs.includeDir outputDir
+    inputs.files sourceSets.main.runtimeClasspath
+    outputs.dir outputDir
 
     doLast {
         outputDir.mkdirs()

subprojects/docs/src/samples/userguide/files/copy/build.gradle

@@ -51,8 +51,8 @@ task copyMethod << {
 // START SNIPPET copy-method-with-dependency
 task copyMethodWithExplicitDependencies{
     // up-to-date check for inputs, plus add copyTask as dependency
-    inputs.includeFile copyTask
-    outputs.includeDir 'some-dir' // up-to-date check for outputs
+    inputs.file copyTask
+    outputs.dir 'some-dir' // up-to-date check for outputs
     doLast{
         copy {
             // Copy the output of copyTask

subprojects/docs/src/samples/userguide/tasks/incrementalBuild/inputsAndOutputs/build.gradle

@@ -2,8 +2,8 @@
 task transform {
     ext.srcFile = file('mountains.xml')
     ext.destDir = new File(buildDir, 'generated')
-    inputs.includeFile srcFile
-    outputs.includeDir destDir
+    inputs.file srcFile
+    outputs.dir destDir
 // END SNIPPET declare-inputs-and-outputs
     doLast {
         println "Transforming source file."

subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy

@@ -65,7 +65,7 @@ class CdtIdePlugin implements Plugin<Project> {
                 }
             }
 
-            inputs.includeFiles({ task.settings.includeRoots }).withPropertyName("settings.includeRoots")
+            inputs.files({ task.settings.includeRoots }).withPropertyName("settings.includeRoots")
             inputFile = project.file(".cproject")
             outputFile = project.file(".cproject")
             factory { new CprojectDescriptor() }

subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ApplicationIntegrationSpec.groovy

@@ -393,7 +393,7 @@ class Main {
             task createDocs {
                 def docs = file("\$buildDir/docs")
 
-                outputs.includeDir docs
+                outputs.dir docs
 
                 doLast {
                     assert docs.mkdirs()

subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildAggregationIntegrationTest.groovy

@@ -118,7 +118,7 @@ class BuildAggregationIntegrationTest extends AbstractIntegrationTest {
               dependsOn upper
               tasks = ["upper"]
               startParameter.searchUpwards = false
-              outputs.includeFile "build.gradle" // having an output (or input) triggers the bug
+              outputs.file "build.gradle" // having an output (or input) triggers the bug
             }
         """
 

subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CacheProjectIntegrationTest.groovy

@@ -167,7 +167,7 @@ dependencies { compile 'commons-io:commons-io:1.4@jar' }
             content += """
 task 'hello$i' {
     File file = file('$TEST_FILE')
-    outputs.includeFile file
+    outputs.file file
     doLast {
         configurations.compile.resolve()
         file.parentFile.mkdirs()
@@ -192,7 +192,7 @@ dependencies { other 'commons-lang:commons-lang:2.6@jar' }
 
 task newTask {
     File file = file('$TEST_FILE')
-    outputs.includeFile file
+    outputs.file file
     doLast {
         configurations.other.resolve()
         file.parentFile.mkdirs()