Update version code, version name and change apk naming scheme

app/build.gradle

@@ -8,8 +8,8 @@ apply plugin: 'kotlin-android-extensions'
 
 // Manifest version information!
 def versionMajor = 1
-def versionMinor = 3
-def versionPatch = 2
+def versionMinor = 4
+def versionPatch = 0
 
 Properties localProps = new Properties()
 File localPropsFile = project.rootProject.file('local.properties')
@@ -28,7 +28,7 @@ android {
         applicationId "foundation.e.blisslauncher"
         minSdkVersion Versions.min_sdk
         targetSdkVersion Versions.target_sdk
-        versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100
+        versionCode versionMajor * 1000000 + versionMinor * 1000 + versionPatch
         versionName "${versionMajor}.${versionMinor}.${versionPatch}"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -49,12 +49,9 @@ android {
         }
 
         applicationVariants.all { variant ->
-            if (variant.buildType.name == "debug") {
                 variant.outputs.all { output ->
-                    outputFileName = "BlissLauncher-${variant.getFlavorName()}-${variant.versionName}.apk"
+                    outputFileName = "BlissLauncher-${variant.versionName}-${variant.getFlavorName()}.apk"
                 }
-            }
-
         }
     }