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

agnostic-apollo · agnostic-apollo · commit 96c5d1e44fe3 · 2025-01-17T02:33:05.000+05:00
diff --git a/.github/workflows/github_action_build.yml b/.github/workflows/github_action_build.yml
@@ -36,7 +36,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 upload step later
           echo "APK_DIR_PATH=$APK_DIR_PATH" >> $GITHUB_ENV
diff --git a/.github/workflows/github_release_build.yml b/.github/workflows/github_release_build.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 file for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag"
           export TERMUX_WIDGET_APP_BUILD__APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
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")
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,8 @@ android {`
`49`	`49`
`50`	`50`	`applicationVariants.all { variant ->`
`51`	`51`	`variant.outputs.all { output ->`
`52`		`- if (variant.buildType.name == "debug") {`
`53`		`- outputFileName = new File("termux-widget_" + (apkVersionTag ? apkVersionTag : "debug") + ".apk")`
`54`		`- } else if (variant.buildType.name == "release") {`
`55`		`- outputFileName = new File("termux-widget_" + (apkVersionTag ? apkVersionTag : "release") + ".apk")`
`56`		`- }`
	`52`	`+ outputFileName = new File("termux-widget-app_" +`
	`53`	`+ (apkVersionTag ? apkVersionTag : "v" + versionName + "+" + variant.buildType.name) + ".apk")`
`57`	`54`	`}`
`58`	`55`	`}`
`59`	`56`