upgraded regex in template build gradle file

plamen5kov · plamen5kov · commit 456ded22c38e · 2015-11-06T14:29:04.000+02:00
diff --git a/build/project-template-gradle/build.gradle b/build/project-template-gradle/build.gradle
@@ -189,13 +189,13 @@ def createIncludeFile (filePath, fileName, dimensionName) {
 }
 
 def sanatizeDimensionName(str) {
-	return str.replaceAll(/[\W]/, "")
+	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 newContent = igFile.text.replaceAll(/dimension\s+["'](.+?)["']/)  { fullMatch, fDimension ->
 							def newFg = sanatizeDimensionName(fDimension)
 							dimensionName = newFg
 							return "dimension \"$newFg\""

Original file line number	Diff line number	Diff line change
`@@ -189,13 +189,13 @@ def createIncludeFile (filePath, fileName, dimensionName) {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`def sanatizeDimensionName(str) {`
`192`		`- return str.replaceAll(/[\W]/, "")`
	`192`	`+ return str.replaceAll(/\W/, "")`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`//make sure the include.gradle file, produced by the user, has only allowed characters in dimension attribute and remove any invalid characters if necessary`
`196`	`196`	`def updateIncludeGradleFile(subFile, dimensionName) {`
`197`	`197`	`def igFile = new File(subFile.getAbsolutePath())`
`198`		`- def newContent = igFile.text.replaceAll(/dimension\s["\|'](.+)["\|'']/) { fullMatch, fDimension ->`
	`198`	`+ def newContent = igFile.text.replaceAll(/dimension\s+["'](.+?)["']/) { fullMatch, fDimension ->`
`199`	`199`	`def newFg = sanatizeDimensionName(fDimension)`
`200`	`200`	`dimensionName = newFg`
`201`	`201`	`return "dimension \"$newFg\""`