Merge pull request #87 from Cognifide/prepare-optional-input-dirs

pun-ky · web-flow · commit a7a064f6c510 · 2017-12-08T09:32:10.000+01:00
Optional input dirs / Gradle API alignment
diff --git a/src/main/kotlin/com/cognifide/gradle/aem/AemConfig.kt b/src/main/kotlin/com/cognifide/gradle/aem/AemConfig.kt
@@ -334,7 +334,7 @@ open class AemConfig(project: Project) : Serializable {
                     "$contentPath/${AemPackagePlugin.VLT_PATH}"
             )
 
-            return paths.filter { !it.isBlank() }.map { File(it) }
+            return paths.filter { !it.isBlank() }.map { File(it) }.filter { it.exists() }
         }
 
     /**
diff --git a/src/main/kotlin/com/cognifide/gradle/aem/pkg/PrepareTask.kt b/src/main/kotlin/com/cognifide/gradle/aem/pkg/PrepareTask.kt
@@ -43,7 +43,7 @@ open class PrepareTask : DefaultTask(), AemTask {
         }
         vaultDir.mkdirs()
 
-        val dirs = config.vaultFilesDirs.filter { it.exists() }
+        val dirs = config.vaultFilesDirs
 
         if (dirs.isEmpty()) {
             logger.info("None of Vault files directories exist: $dirs. Only generated defaults will be used.")

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ open class AemConfig(project: Project) : Serializable {`
`334`	`334`	`"$contentPath/${AemPackagePlugin.VLT_PATH}"`
`335`	`335`	`)`
`336`	`336`
`337`		`- return paths.filter { !it.isBlank() }.map { File(it) }`
	`337`	`+ return paths.filter { !it.isBlank() }.map { File(it) }.filter { it.exists() }`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ open class PrepareTask : DefaultTask(), AemTask {`
`43`	`43`	`}`
`44`	`44`	`vaultDir.mkdirs()`
`45`	`45`
`46`		`- val dirs = config.vaultFilesDirs.filter { it.exists() }`
	`46`	`+ val dirs = config.vaultFilesDirs`
`47`	`47`
`48`	`48`	`if (dirs.isEmpty()) {`
`49`	`49`	`logger.info("None of Vault files directories exist: $dirs. Only generated defaults will be used.")`