Changed!: Add -app suffix to app name and add version name in APKs …

…generated
tmzullinger · Jun 23, 2024 · a6d7176 · a6d7176
1 parent 56f3eda
commit a6d7176
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/attach_debug_apk_to_release.yml b/.github/workflows/attach_debug_apk_to_release.yml
@@ -35,7 +35,7 @@ jobs:
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
           APK_VERSION_TAG="$RELEASE_VERSION_NAME+github-debug"
-          APK_BASENAME_PREFIX="termux-widget_$APK_VERSION_TAG"
+          APK_BASENAME_PREFIX="termux-widget-app_$APK_VERSION_TAG"
 
           echo "Building APK for '$RELEASE_VERSION_NAME' release"
           export TERMUX_WIDGET_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
@@ -31,7 +31,7 @@ jobs:
 
           APK_DIR_PATH="./app/build/outputs/apk/debug"
           APK_VERSION_TAG="$RELEASE_VERSION_NAME-github-debug" # Note the "-", GITHUB_SHA will already have "+" before it
-          APK_BASENAME_PREFIX="termux-widget_$APK_VERSION_TAG"
+          APK_BASENAME_PREFIX="termux-widget-app_$APK_VERSION_TAG"
 
           # Used by attachment steps later
           echo "APK_DIR_PATH=$APK_DIR_PATH" >> $GITHUB_ENV

diff --git a/app/build.gradle b/app/build.gradle
@@ -49,11 +49,8 @@ android {
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            if (variant.buildType.name == "debug") {
-                outputFileName = new File("termux-widget_" + (apkVersionTag ? apkVersionTag : "debug") + ".apk")
-            } else if (variant.buildType.name == "release") {
-                outputFileName = new File("termux-widget_" + (apkVersionTag ? apkVersionTag : "release") + ".apk")
-            }
+            outputFileName = new File("termux-widget-app_" +
+                    (apkVersionTag ? apkVersionTag : "v" + versionName + "+" + variant.buildType.name) + ".apk")
         }
     }