From ff1f8c8ff8cf9ef8d5534531b4df657ea10817d0 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Sat, 22 Jun 2024 21:39:31 +0500 Subject: [PATCH] Changed!: Add `-app` suffix to app name and add version name in APKs generated --- .github/workflows/github_action_build.yml | 2 +- .github/workflows/github_release_build.yml | 2 +- app/build.gradle | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/github_action_build.yml b/.github/workflows/github_action_build.yml index e7ca10e..18012c3 100644 --- a/.github/workflows/github_action_build.yml +++ b/.github/workflows/github_action_build.yml @@ -43,7 +43,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-styling_$APK_VERSION_TAG" + APK_BASENAME_PREFIX="termux-styling-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 index eec1680..c56942f 100644 --- a/.github/workflows/github_release_build.yml +++ b/.github/workflows/github_release_build.yml @@ -39,7 +39,7 @@ jobs: APK_DIR_PATH="./app/build/outputs/apk/debug" APK_VERSION_TAG="$RELEASE_VERSION_NAME+github.debug" - APK_BASENAME_PREFIX="termux-styling_$APK_VERSION_TAG" + APK_BASENAME_PREFIX="termux-styling-app_$APK_VERSION_TAG" echo "Building APK file for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag" export TERMUX_STYLING_APP_BUILD__APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle diff --git a/app/build.gradle b/app/build.gradle index d0bc68c..ef9e63e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,11 +54,8 @@ android { applicationVariants.all { variant -> variant.outputs.all { output -> - if (variant.buildType.name == "debug") { - outputFileName = new File("termux-styling_" + (apkVersionTag ? apkVersionTag : "debug") + ".apk") - } else if (variant.buildType.name == "release") { - outputFileName = new File("termux-styling_" + (apkVersionTag ? apkVersionTag : "release") + ".apk") - } + outputFileName = new File("termux-styling-app_" + + (apkVersionTag ? apkVersionTag : "v" + versionName + "+" + variant.buildType.name) + ".apk") } } }