Allow directory and regular file to be passed to etag properties

michel-kraemer · Oct 4, 2020 · eee9aa2 · eee9aa2
1 parent c87acb0
commit eee9aa2
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/main/java/de/undercouch/gradle/tasks/download/DownloadAction.java b/src/main/java/de/undercouch/gradle/tasks/download/DownloadAction.java
@@ -948,19 +948,8 @@ private File getDestinationFromDirProperty(Object dir) {
 
     @Override
     public void downloadTaskDir(Object dir) {
-        if (dir instanceof Closure) {
-            //lazily evaluate closure
-            Closure<?> closure = (Closure<?>)dir;
-            dir = closure.call();
-        }
-
-        dir = tryGetProvider(dir);
-
-        if (dir instanceof CharSequence) {
-            this.downloadTaskDir = projectApi.file(dir.toString());
-        } else if (dir instanceof File) {
-            this.downloadTaskDir = (File)dir;
-        } else {
+        downloadTaskDir = getDestinationFromDirProperty(dir);
+        if (downloadTaskDir == null) {
             throw new IllegalArgumentException("download-task directory must " +
                 "either be a File or a CharSequence");
         }
@@ -988,6 +977,8 @@ public void cachedETagsFile(Object location) {
 
         if (location instanceof CharSequence) {
             this.cachedETagsFile = projectApi.file(location.toString());
+        } else if (isRegularFile(location)) {
+            this.cachedETagsFile = getFileFromRegularFile(location);
         } else if (location instanceof File) {
             this.cachedETagsFile = (File)location;
         } else {