Merge pull request #102 from melezov/allow-folders-and-files

Make dslSources allow both folders and standalone .dsl and .ddd files
ngs-doo · Feb 16, 2019 · 471750f · 471750f
2 parents 0759465 + 886a369
commit 471750f
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/SbtPlugin/src/main/scala/com/dslplatform/sbt/SbtDslPlatformPlugin.scala b/SbtPlugin/src/main/scala/com/dslplatform/sbt/SbtDslPlatformPlugin.scala
@@ -153,16 +153,10 @@ object SbtDslPlatformPlugin extends AutoPlugin {
           }.toSet
         }
 
-        def recursiveListFiles(f: File): Array[File] = {
-          val files = f.listFiles
-          files.filter(it => it.getName.endsWith(".dsl") || it.getName.endsWith(".ddd")) ++
-            files.filter(_.isDirectory).flatMap(recursiveListFiles)
-        }
-        // Index only *.dsl files
+        // Index only *.dsl and *.ddd files
         val dslPathFiles = dslDslPath
           .value
-          .filter(_.exists())
-          .flatMap(recursiveListFiles)
+          .flatMap(path => (path ** ("*.dsl" || "*.ddd")).get)
           .toSet
 
         logger.info(s"Found ${dslPathFiles.size} DSL files")