Remove use of deprecated/removed APIs

gradle · Oct 3, 2019 · 373d3b0 · 373d3b0
1 parent c0c83a6
commit 373d3b0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/...y/header-gradle-plugin/src/main/java/org/gradle/samples/tasks/GenerateDummyCppSource.java b/...y/header-gradle-plugin/src/main/java/org/gradle/samples/tasks/GenerateDummyCppSource.java
@@ -14,7 +14,7 @@
 @CacheableTask
 public class GenerateDummyCppSource extends DefaultTask {
     private final Property<String> symbolName = getProject().getObjects().property(String.class);
-    private final RegularFileProperty outputFile = newOutputFile();
+    private final RegularFileProperty outputFile = getProject().getObjects().fileProperty();
 
     @TaskAction
     private void doGenerate() throws IOException {

diff --git a/cpp/provisionable-tool-chains/buildSrc/build.gradle b/cpp/provisionable-tool-chains/buildSrc/build.gradle
@@ -28,7 +28,7 @@ class DownloadToolChainTask extends DefaultTask {
     final Property<URL> fromUrl = project.objects.property(URL)
 
     @OutputFile
-    final RegularFileProperty outputFile = newOutputFile()
+    final RegularFileProperty outputFile = project.objects.fileProperty()
 
     @TaskAction
     private void download() {
@@ -38,13 +38,13 @@ class DownloadToolChainTask extends DefaultTask {
 
 class ExtractToolChainTask extends DefaultTask {
     @InputFile
-    final RegularFileProperty toolChainArchive = newInputFile()
+    final RegularFileProperty toolChainArchive = project.objects.fileProperty()
 
     // Currently cannot use the OutputDirectory annotation on directory containing symbolic links to non-existing files
     // See https://github.com/gradle/gradle/issues/4428
     // Use a done file instead
     //@OutputDirectory
-    final DirectoryProperty toolChainLocation = newOutputDirectory()
+    final DirectoryProperty toolChainLocation = project.objects.directoryProperty()
 
     @OutputFile  // See comment on toolChainLocation property
     final Provider<File> doneFile = project.provider {new File(toolChainLocation.get().asFile.absolutePath + ".done")}

diff --git a/samples-dev/src/templates/cpp-provisionable-tool-chains-build/buildSrc/build.gradle b/samples-dev/src/templates/cpp-provisionable-tool-chains-build/buildSrc/build.gradle
@@ -28,7 +28,7 @@ class DownloadToolChainTask extends DefaultTask {
     final Property<URL> fromUrl = project.objects.property(URL)
 
     @OutputFile
-    final RegularFileProperty outputFile = newOutputFile()
+    final RegularFileProperty outputFile = project.objects.fileProperty()
 
     @TaskAction
     private void download() {
@@ -38,13 +38,13 @@ class DownloadToolChainTask extends DefaultTask {
 
 class ExtractToolChainTask extends DefaultTask {
     @InputFile
-    final RegularFileProperty toolChainArchive = newInputFile()
+    final RegularFileProperty toolChainArchive = project.objects.fileProperty()
 
     // Currently cannot use the OutputDirectory annotation on directory containing symbolic links to non-existing files
     // See https://github.com/gradle/gradle/issues/4428
     // Use a done file instead
     //@OutputDirectory
-    final DirectoryProperty toolChainLocation = newOutputDirectory()
+    final DirectoryProperty toolChainLocation = project.objects.directoryProperty()
 
     @OutputFile  // See comment on toolChainLocation property
     final Provider<File> doneFile = project.provider {new File(toolChainLocation.get().asFile.absolutePath + ".done")}

diff --git a/samples-dev/src/templates/swift-provisionable-tool-chains-build/buildSrc/build.gradle b/samples-dev/src/templates/swift-provisionable-tool-chains-build/buildSrc/build.gradle
@@ -28,7 +28,7 @@ class DownloadToolChainTask extends DefaultTask {
     final Property<URL> fromUrl = project.objects.property(URL)
 
     @OutputFile
-    final RegularFileProperty outputFile = newOutputFile()
+    final RegularFileProperty outputFile = project.objects.fileProperty()
 
     @TaskAction
     private void download() {
@@ -38,13 +38,13 @@ class DownloadToolChainTask extends DefaultTask {
 
 class ExtractToolChainTask extends DefaultTask {
     @InputFile
-    final RegularFileProperty toolChainArchive = newInputFile()
+    final RegularFileProperty toolChainArchive = project.objects.fileProperty()
 
     // Currently cannot use the OutputDirectory annotation on directory containing symbolic links to non-existing files
     // See https://github.com/gradle/gradle/issues/4428
     // Use a done file instead
     //@OutputDirectory
-    final DirectoryProperty toolChainLocation = newOutputDirectory()
+    final DirectoryProperty toolChainLocation = project.objects.directoryProperty()
 
     @OutputFile  // See comment on toolChainLocation property
     final Provider<File> doneFile = project.provider {new File(toolChainLocation.get().asFile.absolutePath + ".done")}

diff --git a/swift/provisionable-tool-chains/buildSrc/build.gradle b/swift/provisionable-tool-chains/buildSrc/build.gradle
@@ -28,7 +28,7 @@ class DownloadToolChainTask extends DefaultTask {
     final Property<URL> fromUrl = project.objects.property(URL)
 
     @OutputFile
-    final RegularFileProperty outputFile = newOutputFile()
+    final RegularFileProperty outputFile = project.objects.fileProperty()
 
     @TaskAction
     private void download() {
@@ -38,13 +38,13 @@ class DownloadToolChainTask extends DefaultTask {
 
 class ExtractToolChainTask extends DefaultTask {
     @InputFile
-    final RegularFileProperty toolChainArchive = newInputFile()
+    final RegularFileProperty toolChainArchive = project.objects.fileProperty()
 
     // Currently cannot use the OutputDirectory annotation on directory containing symbolic links to non-existing files
     // See https://github.com/gradle/gradle/issues/4428
     // Use a done file instead
     //@OutputDirectory
-    final DirectoryProperty toolChainLocation = newOutputDirectory()
+    final DirectoryProperty toolChainLocation = project.objects.directoryProperty()
 
     @OutputFile  // See comment on toolChainLocation property
     final Provider<File> doneFile = project.provider {new File(toolChainLocation.get().asFile.absolutePath + ".done")}