Create sane APK names from gradle builds

Author: mashbridge

eddystone-uid/tools/txeddystone-uid/TxEddystone-UID/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply from: '../variants.gradle'
 
 android {
     compileSdkVersion 22
@@ -9,8 +10,9 @@ android {
         minSdkVersion 22
         targetSdkVersion 22
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false

eddystone-uid/tools/txeddystone-uid/TxEddystone-UID/variants.gradle

@@ -0,0 +1,20 @@
+// Name and version the APK variants.
+
+android.applicationVariants.all { variant ->
+  def outName
+  if (project.hasProperty("applicationName")) {
+    outName = applicationName
+  } else {
+    outName = parent.name
+  }
+
+  variant.outputs.each { output ->
+    def apkName
+    if (output.zipAlign) {
+      apkName = "${outName}-${output.baseName}-${variant.versionName}.apk"
+    } else {
+      apkName = "${outName}-${output.baseName}-${variant.versionName}-unaligned.apk"
+    }
+    output.outputFile = new File(output.outputFile.parent, apkName)
+  }
+}

tools/eddystone-validator/EddystoneValidator/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply from: '../variants.gradle'
 
 android {
     compileSdkVersion 22

tools/eddystone-validator/EddystoneValidator/variants.gradle

@@ -0,0 +1,20 @@
+// Name and version the APK variants.
+
+android.applicationVariants.all { variant ->
+  def outName
+  if (project.hasProperty("applicationName")) {
+    outName = applicationName
+  } else {
+    outName = parent.name
+  }
+
+  variant.outputs.each { output ->
+    def apkName
+    if (output.zipAlign) {
+      apkName = "${outName}-${output.baseName}-${variant.versionName}.apk"
+    } else {
+      apkName = "${outName}-${output.baseName}-${variant.versionName}-unaligned.apk"
+    }
+    output.outputFile = new File(output.outputFile.parent, apkName)
+  }
+}