Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Comment out apk-renaming stuff. It's confusing AS.

Browse source
This commit is contained in:
Eric House 2016-01-13 07:58:59 -08:00
parent dffaf2335e
commit 26d0aedb8f
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
xwords4/android/XWords4/app/build.gradle
View file

@ -21,9 +21,9 @@ android {
} }
// Rename all output artifacts to include version information // Rename all output artifacts to include version information
applicationVariants.all { variant -> // applicationVariants.all { variant ->
renameArtifact(variant) // renameArtifact(variant)
} // }
// flavorDimensions "variant", "abi" // flavorDimensions "variant", "abi"
// productFlavors { // productFlavors {
@ -185,25 +185,25 @@ tasks.whenTaskAdded { theTask ->
} }
} }
def getVersionName() { // def getVersionName() {
try { // try {
def stdout = new ByteArrayOutputStream() // def stdout = new ByteArrayOutputStream()
exec { // exec {
commandLine 'git', 'describe', '--dirty' // commandLine 'git', 'describe', '--dirty'
standardOutput = stdout // standardOutput = stdout
} // }
return stdout.toString().trim() // return stdout.toString().trim()
} // }
catch (ignored) { // catch (ignored) {
return null; // return null;
} // }
} // }
def renameArtifact(variant) { // def renameArtifact(variant) {
variant.outputs.each { output -> // variant.outputs.each { output ->
def name = String.format( "XWords4-%s-%s.apk", variant.name, // def name = String.format( "XWords4-%s-%s.apk", variant.name,
getVersionName() ) // getVersionName() )
output.outputFile = new File( (String)output.outputFile.parent, // output.outputFile = new File( (String)output.outputFile.parent,
(String)name ) // (String)name )
} // }
} // }