Tweaks to run in gradle 1.7.

Pass CopyActionImpl Instantiator instance. Change visitFile and visitDir method signatures to override EmptyCopySpecVisitor methods
david-resnick · Aug 23, 2013 · 38c0542 · 38c0542
1 parent 066223d
commit 38c0542
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/groovy/com/trigonic/gradle/plugins/rpm/Rpm.groovy b/src/main/groovy/com/trigonic/gradle/plugins/rpm/Rpm.groovy
@@ -25,6 +25,7 @@ import org.freecompany.redline.header.Os
 import org.freecompany.redline.header.RpmType
 import org.freecompany.redline.payload.Directive
 import org.gradle.api.internal.file.FileResolver
+import org.gradle.internal.reflect.Instantiator
 import org.gradle.api.internal.file.copy.CopyActionImpl
 import org.gradle.api.tasks.bundling.AbstractArchiveTask
 
@@ -59,7 +60,7 @@ class Rpm extends AbstractArchiveTask {
     List<Dependency> dependencies = new ArrayList<Dependency>();
 
     Rpm() {
-        action = new RpmCopyAction(services.get(FileResolver.class))
+        action = new RpmCopyAction(services.get(Instantiator.class), services.get(FileResolver.class))
         extension = RPM_EXTENSION
 
         packageName = project.archivesBaseName
@@ -150,8 +151,8 @@ class Rpm extends AbstractArchiveTask {
     }
 
     class RpmCopyAction extends CopyActionImpl {
-        public RpmCopyAction(FileResolver resolver) {
-            super(resolver, new RpmCopySpecVisitor());
+        public RpmCopyAction(Instantiator instantiator, FileResolver resolver) {
+            super(instantiator, resolver, new RpmCopySpecVisitor());
         }
 
         Rpm getTask() {

diff --git a/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy b/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy
@@ -18,7 +18,7 @@ package com.trigonic.gradle.plugins.rpm
 
 import org.freecompany.redline.Builder
 import org.freecompany.redline.header.Header.HeaderTag
-import org.gradle.api.file.FileVisitDetails
+import org.gradle.api.file.FileCopyDetails
 import org.gradle.api.internal.file.copy.CopyAction
 import org.gradle.api.internal.file.copy.EmptyCopySpecVisitor
 import org.gradle.api.internal.file.copy.ReadableCopySpec
@@ -76,15 +76,15 @@ class RpmCopySpecVisitor extends EmptyCopySpecVisitor {
     }
 
     @Override
-    void visitFile(FileVisitDetails fileDetails) {
+    void visitFile(FileCopyDetails fileDetails) {
         logger.debug "adding file {}", fileDetails.relativePath.pathString
         builder.addFile "/" + fileDetails.relativePath.pathString, fileDetails.file,
             spec.fileMode == null ? -1 : spec.fileMode, -1, spec.fileType, spec.user ?: task.user, spec.group ?: task.group,
                 spec.addParentDirs
     }
 
     @Override
-    void visitDir(FileVisitDetails dirDetails) {
+    void visitDir(FileCopyDetails dirDetails) {
         if (spec.createDirectoryEntry) {
             logger.debug "adding directory {}", dirDetails.relativePath.pathString
             builder.addDirectory "/" + dirDetails.relativePath.pathString, spec.dirMode == null ? -1 : spec.dirMode,