improve whitespace readability in proguard plugin

2 files changed, 12 insertions, 8 deletions

diff --git a/stage2/Lib.scala b/stage2/Lib.scala
index dbcd06f..50b7389 100644
--- a/stage2/Lib.scala
+++ b/stage2/Lib.scala
@@ -540,4 +540,15 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger){
       ( directory.getParentFile ++ ("/" ++ lib.buildDirectoryName) ).exists
     ) findOuterMostModuleDirectory(directory.getParentFile) else directory
   }
+
+  def transformFiles( files: Seq[File], transform: String => String ): Seq[File] = {
+    files.flatMap{ file =>
+      val string = file.readAsString
+      val replaced = transform( string )
+      if( string != replaced ) {
+        write( file, replaced )
+        Some(file)
+      } else None
+    }
+  }
 }
diff --git a/stage2/plugins/GeneratedSections.scala b/stage2/plugins/GeneratedSections.scala
index 417278c..dc065cf 100644
--- a/stage2/plugins/GeneratedSections.scala
+++ b/stage2/plugins/GeneratedSections.scala
@@ -26,14 +26,7 @@ trait GeneratedSections extends BaseBuild{
       }.getOrElse(subject)
     }
 
-    val updated = sourceFiles.flatMap{ file =>
-      val template = file.readAsString
-      val replaced = replaceSections( template, replacements )
-      if( template != replaced ) {
-        write( file.toPath, replaced.getBytes )
-        Some(file)
-      } else None
-    }
+    val updated = lib.transformFiles( sourceFiles, replaceSections( _, replacements ) )
 
     logger.log("generated-sections","Updated:" + updated.map(_ ++ "\n").mkString)
   }