caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #3 from dlvoy/hotfix/ignoring-codestyles-changes

Browse source 
Ignore changes to codeStyles and stray files
This commit is contained in:
Milos Kozak 2020-09-25 09:05:45 +02:00 committed by GitHub
commit 870c9bb23d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -103,13 +103,15 @@ def allCommited = { ->
commandLine 'git', 'status', '-s' commandLine 'git', 'status', '-s'
standardOutput = stdout standardOutput = stdout
} }
String commitObject = stdout.toString().trim() // ignore all changes done in .idea/codeStyles
stringBuilder.append(commitObject) String cleanedList = stdout.toString().replaceAll(/(?m)^\s*(M|A|D|\?\?)\s*.*?\.idea\/codeStyles\/.*?\s*$/, "")
// ignore all files added to project dir but not staged/known to GIT
cleanedList = cleanedList.replaceAll(/(?m)^\s*(\?\?)\s*.*?\s*$/, "")
stringBuilder.append(cleanedList.trim())
} catch (ignored) { } catch (ignored) {
return false // NoGitSystemAvailable return false // NoGitSystemAvailable
} }
return stringBuilder.toString().isEmpty() return stringBuilder.toString().isEmpty()
} }
tasks.matching { it instanceof Test }.all { tasks.matching { it instanceof Test }.all {