use better replacement algorithm for productFlavors in plugin supplied include.gradle files

Author: blagoev

build/project-template-gradle/build.gradle

@@ -223,24 +223,63 @@ def sanatizeDimensionName(str) {
 	return str.replaceAll(/\W/, "")
 }
 
+def replaceProductFlavorInContent(content, dimension, flavor)
+{
+  def indexStart = content.indexOf("productFlavors");
+  def index = indexStart  + "productFlavors".length();
+  def indexEnd = -1;
+  def nestedOpenBraketsCount = 0;
+
+  while (index < content.length())
+  {
+      print content[index]
+      if (content[index] == "}")
+      {
+          if (nestedOpenBraketsCount == 0)
+          {
+              indexEnd = index;
+              break;
+          }
+          else
+          {
+              nestedOpenBraketsCount--;
+          }
+      }
+      else if (content[index] == "{")
+      {
+          nestedOpenBraketsCount++;
+      }
+
+      index++;
+  }
+
+    if (indexEnd != -1)
+    {
+      def oldProductFlavorsText = content.substring(indexStart, indexEnd - 1);
+      
+      def newProductFlavorsText = """
+          productFlavors {
+              "${flavor}" {
+                  dimension "${dimension}"
+              }
+          }
+          """;
+      
+      return content.replace(oldProductFlavorsText, newProductFlavorsText);
+    }
+    else
+    {
+      return ''
+    }
+}
+
 //make sure the include.gradle file, produced by the user, has only allowed characters in dimension attribute and remove any invalid characters if necessary
-def updateIncludeGradleFile(subFile, dimensionName, flavor) {
-	def igFile = new File(subFile.getAbsolutePath())
-	def newContent = igFile.text.replaceAll(/dimension\s+["'](.+?)["']/)  { fullMatch, fDimension ->
-							def newFg = sanatizeDimensionName(fDimension)
-							dimensionName = newFg
-							return "dimension \"$newFg\""
-						}
-						
-  //println "Before patch: " + newContent
-						
-  def finalContent = newContent.replace(dimensionName + "\" {", flavor + "\" {")
-  
-  //println "Dimension: " + dimensionName + " final content: " + finalContent
-  
-	igFile.text = finalContent
-	
-	return dimensionName
+def updateIncludeGradleFile(targetFile, dimensionName, flavor)
+{
+	def fileEntry = new File(targetFile.getAbsolutePath());
+	def content = fileEntry.text;
+	def replacedContent = replaceProductFlavorInContent(content, dimensionName, flavor);
+	fileEntry.text = replacedContent;
 }
 
 def flavorNumber = 0
@@ -265,7 +304,7 @@ task createDefaultIncludeFiles {
 
 				if(subFile.name == "include.gradle") {
 					foundIncludeFile = true
-					dimensionName = updateIncludeGradleFile(subFile, dimensionName, flavor)
+					updateIncludeGradleFile(subFile, dimensionName, flavor)
 				}
 			}