Merge pull request #56 from s1204IT/main

Build the App Bundle too
iamr0s · May 11, 2024 · b751c44 · b751c44
2 parents 1e456aa + 70ea2f4
commit b751c44
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,14 +31,19 @@ jobs:
 
       - name: Build with Gradle
         run: |
-          ./gradlew assembleRelease --stacktrace
+          ./gradlew assembleRelease bundleRelease --stacktrace
           {
             echo "version=v$(grep versionName version.properties | sed 's/^[^=]*=//')"
             echo "commit=$(echo ${{ github.sha }} | cut -c-7)"
           } >> $GITHUB_ENV
 
-      - name: Upload APK
+      - name: Copy built artifacts
+        run: |
+          cp -v app/build/outputs/apk/release/app-release.apk Dhizuku-${{ env.version }}.apk
+          cp -v app/build/outputs/bundle/release/app-release.aab Dhizuku-${{ env.version }}.aab
+
+      - name: Upload
         uses: actions/upload-artifact@v4
         with:
           name: Dhizuku(${{ env.version }}@${{ env.commit }})
-          path: app/build/outputs/apk/release/app-release.apk
+          path: Dhizuku-${{ env.version }}.a*
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -37,4 +37,7 @@
 
 -keep class rikka.shizuku.ShizukuProvider
 
--dontwarn **
+-dontwarn **
+
+-keepattributes LineNumberTable,SourceFile
+-renamesourcefileattribute SourceFile