From 81e3198790b7d2a354b772825448a2150e274bf8 Mon Sep 17 00:00:00 2001 From: Yimura <24669514+Yimura@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:57:40 +0100 Subject: [PATCH 1/2] feat(Build): change apk name to FridaManager.apk --- .github/workflows/release.yml | 5 ----- app/build.gradle.kts | 13 +++++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d5f6845..ec259bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,10 +57,6 @@ jobs: RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }} run: ./gradlew bundleRelease --stacktrace - - name: Get release file aab path - id: releaseAab - run: echo "aabfile=$(find app/build/outputs/bundle/release/*.aab)" >> $GITHUB_OUTPUT - - name: Get release file apk path id: releaseApk run: echo "apkfile=$(find app/build/outputs/apk/release/*.apk)" >> $GITHUB_OUTPUT @@ -70,7 +66,6 @@ jobs: with: files: | ${{ steps.releaseApk.outputs.apkfile }} - ${{ steps.releaseAab.outputs.aabfile }} draft: true prerelease: true generate_release_notes: true \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 17fa4dd..547341d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,6 +12,14 @@ android { keyPassword = System.getenv("RELEASE_KEY_PASSWORD") } } + + applicationVariants.all { + outputs.all { + val output = this as com.android.build.gradle.internal.api.BaseVariantOutputImpl + output.outputFileName = "FridaManager.apk" + } + } + namespace = "sh.damon.fridamgr" compileSdk = 34 @@ -19,8 +27,8 @@ android { applicationId = "sh.damon.fridamgr" minSdk = 29 targetSdk = 34 - versionCode = 4 - versionName = "0.1.3" + versionCode = 5 + versionName = "0.1.5" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -35,6 +43,7 @@ android { signingConfig = signingConfigs.getByName("release") } } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 From 7c11af5398fc078ac261ae0e770670efcce391ad Mon Sep 17 00:00:00 2001 From: Yimura <24669514+Yimura@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:01:45 +0100 Subject: [PATCH 2/2] fix(Build): wrong version number --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 547341d..3d3b10b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,7 +28,7 @@ android { minSdk = 29 targetSdk = 34 versionCode = 5 - versionName = "0.1.5" + versionName = "0.1.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }