From a20fbb3bbf68b6a498a72aea58e23d700bda90e7 Mon Sep 17 00:00:00 2001
From: Manuel Zedel <manuel.zedel@d-labs.com>
Date: Fri, 23 Nov 2018 14:59:45 +0100
Subject: [PATCH] modify build export for signing - removed spaces + version
 info from apk

---
 .../build.gradle                              |  2 +-
 .../build.gradle                              | 20 +++++++++----------
 .../build.gradle                              | 20 +++++++++----------
 .../build.gradle                              | 18 ++++++++---------
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/build.gradle b/mobile/com.sap.sailing.android.shared/build.gradle
index 43c8718cce5..ccada58c361 100644
--- a/mobile/com.sap.sailing.android.shared/build.gradle
+++ b/mobile/com.sap.sailing.android.shared/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     api "de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}"
 
     /* Branch.io */
-    api group: 'io.branch.sdk.android', name: 'library', version: '2.19.2'
+    api group: "io.branch.sdk.android", name: "library", version: "2.19.2"
 
     /* JVM tests */
     testImplementation "junit:junit:${rootProject.ext.junit}"
diff --git a/mobile/com.sap.sailing.android.tracking.app/build.gradle b/mobile/com.sap.sailing.android.tracking.app/build.gradle
index 712f35477be..c40731f72bf 100644
--- a/mobile/com.sap.sailing.android.tracking.app/build.gradle
+++ b/mobile/com.sap.sailing.android.tracking.app/build.gradle
@@ -20,19 +20,17 @@ android {
      */
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            def newName = outputFileName.replace(".apk", "-v" + variant.versionName + ".apk");
-            newName = newName.replace("-" + variant.buildType.name, "");
-            outputFileName = new File(newName)
+            outputFileName = new File(outputFileName.replace("-$variant.buildType.name", ""))
         }
         variant.assemble.doLast { assemble ->
-            // Create version file
-            def versionFile = new File(rootProject.ext.destinationFolder, "$packageName." + "version")
-            versionFile.text = "$packageName" + ".apk=$verCode"
-            copy {
-                from variant.outputs*.outputFile
-                into rootProject.ext.destinationFolder
-            }
-        }
+           // Create version file
+           def versionFile = new File(rootProject.ext.destinationFolder, packageName + ".version")
+           versionFile.text = packageName + ".apk=$verCode-$variant.buildType.name"
+           copy {
+               from variant.outputs*.outputFile
+               into rootProject.ext.destinationFolder
+           }
+       }
     }
 
     def versionPropertiesFile = file('project.properties')
diff --git a/mobile/com.sap.sailing.buoy.positioning/build.gradle b/mobile/com.sap.sailing.buoy.positioning/build.gradle
index e6a343854f8..c24334261f6 100644
--- a/mobile/com.sap.sailing.buoy.positioning/build.gradle
+++ b/mobile/com.sap.sailing.buoy.positioning/build.gradle
@@ -20,19 +20,17 @@ android {
      */
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            def newName = outputFileName.replace(".apk", "-v" + variant.versionName + ".apk");
-            newName = newName.replace("-" + variant.buildType.name, "");
-            outputFileName = new File(newName)
+            outputFileName = new File(outputFileName.replace("-$variant.buildType.name", ""))
         }
         variant.assemble.doLast { assemble ->
-            // Create version file
-            def versionFile = new File(rootProject.ext.destinationFolder, "$packageName." + "version")
-            versionFile.text = "$packageName" + ".apk=$verCode"
-            copy {
-                from variant.outputs*.outputFile
-                into rootProject.ext.destinationFolder
-            }
-        }
+           // Create version file
+           def versionFile = new File(rootProject.ext.destinationFolder, packageName + ".version")
+           versionFile.text = packageName + ".apk=$verCode-$variant.buildType.name"
+           copy {
+               from variant.outputs*.outputFile
+               into rootProject.ext.destinationFolder
+           }
+       }
     }
 
     def versionPropertiesFile = file('project.properties')
diff --git a/mobile/com.sap.sailing.racecommittee.app/build.gradle b/mobile/com.sap.sailing.racecommittee.app/build.gradle
index 593aa765259..2410ff5c5de 100644
--- a/mobile/com.sap.sailing.racecommittee.app/build.gradle
+++ b/mobile/com.sap.sailing.racecommittee.app/build.gradle
@@ -18,22 +18,20 @@ android {
     /**
      * Copies apk into www apps directory and create version file
      */
-   applicationVariants.all { variant ->
-       variant.outputs.all { output ->
-           def newName = outputFileName.replace(".apk", "-v" + variant.versionName + ".apk");
-           newName = newName.replace("-" + variant.buildType.name, "");
-           outputFileName = new File(newName)
-       }
-       variant.assemble.doLast { assemble ->
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            outputFileName = new File(outputFileName.replace("-$variant.buildType.name", ""))
+        }
+        variant.assemble.doLast { assemble ->
            // Create version file
-           def versionFile = new File(rootProject.ext.destinationFolder, "$packageName." + "version")
-           versionFile.text = "$packageName" + ".apk=$verCode"
+           def versionFile = new File(rootProject.ext.destinationFolder, "$packageName" + ".version")
+           versionFile.text = "$packageName" + ".apk=$verCode-$variant.buildType.name"
            copy {
                from variant.outputs*.outputFile
                into rootProject.ext.destinationFolder
            }
        }
-   }
+    }
 
     def versionPropertiesFile = file('project.properties')
     if (versionPropertiesFile.exists()) {