defaultExcludedFiles arrayList was added to exclude files generated b…

…y the tool
fundacionjala · Oct 7, 2015 · 4346c46 · 4346c46
1 parent 5a3a556
commit 4346c46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...vy/org/fundacionjala/gradle/plugins/enforce/tasks/salesforce/deployment/Deployment.groovy b/...vy/org/fundacionjala/gradle/plugins/enforce/tasks/salesforce/deployment/Deployment.groovy
@@ -35,7 +35,6 @@ abstract class Deployment extends SalesforceTask {
     public String taskFolderName
     public String taskPackagePath
     public String taskDestructivePath
-    private final String FILE_CUSTOM_COMPONENT_TRACKER_NAME = ".customComponentTracker.data"
     ClassifiedFile classifiedFile
 
     /**
@@ -173,7 +172,6 @@ abstract class Deployment extends SalesforceTask {
      * @return a map with files classified
      */
     void loadClassifiedFiles(String includes, String excludes) {
-        filter.excludeFiles.add(FILE_CUSTOM_COMPONENT_TRACKER_NAME)
         ArrayList<File> filesFiltered = filter.getFiles(includes, excludes)
         classifiedFile = FileValidator.validateFiles(projectPath, filesFiltered)
         classifiedFile.ShowClassifiedFiles(showValidatedFiles == Constants.TRUE_OPTION, projectPath)

diff --git a/...ain/groovy/org/fundacionjala/gradle/plugins/enforce/utils/salesforce/filter/Filter.groovy b/...ain/groovy/org/fundacionjala/gradle/plugins/enforce/utils/salesforce/filter/Filter.groovy
@@ -10,6 +10,8 @@ class Filter {
     private Project project
     private String projectPath
     ArrayList<String> excludeFiles
+    private final String FILE_CUSTOM_COMPONENT_TRACKER_NAME = ".customComponentTracker.data"
+    ArrayList<String> defaultExcludedFiles = [Constants.FILE_TRACKER_NAME, FILE_CUSTOM_COMPONENT_TRACKER_NAME]
 
     Filter(Project project, String projectPath) {
         this.project = project
@@ -46,7 +48,7 @@ class Filter {
      * @return an array list of files
      */
     public ArrayList<File> getFiles(String includes, String excludes) {
-        ArrayList<String> criteriaToExclude = [Constants.FILE_TRACKER_NAME]
+        ArrayList<String> criteriaToExclude = defaultExcludedFiles
         ArrayList<String> criteriaToInclude = []
         criteriaToExclude.addAll(excludeFiles)
         if(excludes && !excludes.isEmpty()) {