fixed bug with invalid characters in flavor dimension when provided by user

Author: plamen5kov

build/project-template-gradle/build.gradle

@@ -173,38 +173,62 @@ dependencies {
 ///////////////////////////// CONFIGURATION PHASE //////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////
 
-def createIncludeFile (filePath, fileName) {
+def createIncludeFile (filePath, fileName, dimensionName) {
 	println "\t+creating include.gradle file for: " + filePath
 	def defaultIncludeFile = new File(filePath, "include.gradle")
 	defaultIncludeFile.write ""
 	defaultIncludeFile << "android { \n"
 	defaultIncludeFile << "\tproductFlavors {\n"
 	defaultIncludeFile << '\t\t"' + fileName + '" {\n'
-	defaultIncludeFile << '\t\t\tdimension "' + fileName + '"\n'
+	defaultIncludeFile << '\t\t\tdimension "' + dimensionName + '"\n'
 	defaultIncludeFile << "\t\t}\n"
 	defaultIncludeFile << "\t}\n"
 	defaultIncludeFile << "}"
 }
 
+def sanatizeDimensionName(str) {
+	return str.replaceAll(/[\W]/, "")
+}
+
+//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) {
+	def igFile = new File(subFile.getAbsolutePath())
+	def newContent = igFile.text.replaceAll(/dimension\s["|'](.+)["|'']/)  { fullMatch, fDimension ->
+							def newFg = sanatizeDimensionName(fDimension)
+							dimensionName = newFg
+							return "dimension \"$newFg\""
+						}
+	igFile.text = newContent
+	
+	return dimensionName
+}
+
 task createDefaultIncludeFiles {
-	description "creates default include.gradle files for added plugins if necessary"
+	description "creates default include.gradle files for added plugins IF NECESSARY"
 	println "$configStage createDefaultIncludeFiles"
 	def ft = file(configurationsDir)
 
 	ft.listFiles().each { fl ->
+	
 		if(fl.isDirectory()) {
+			def fileName = fl.name
+			def dimensionName = sanatizeDimensionName(fileName)
 			createPluginConfigFile = true
-			pluginNames.add('"' + fl.name + '"')
-			
 			def foundIncludeFile = false
+			
+			println "\t+found plugins: " + fileName
 			fl.listFiles().each { subFile ->
+			
 				if(subFile.name == "include.gradle") {
 					foundIncludeFile = true
+					dimensionName = updateIncludeGradleFile(subFile, dimensionName)
 				}
 			}
 
+			pluginNames.add('"' + dimensionName + '"')
+			
 			if(!foundIncludeFile) {
-				createIncludeFile(fl.getAbsolutePath() ,fl.name)
+				createIncludeFile(fl.getAbsolutePath() ,fileName, dimensionName)
 			}
 		}
 	}
@@ -222,7 +246,6 @@ task createPluginsConfigFile {
 		if(createPluginConfigFile) {
 			println "\t+creating product flavors include.gradle file in $configurationsDir folder..."
 			def flavors = pluginNames.join(",")
-			println "\t+found plugins: " + flavors
 			flavorsFile << "android { \n"
 			flavorsFile << "\tflavorDimensions " + flavors + "\n"
 			flavorsFile << "}\n"