chore: Merge branch dev to main (#2468)

Author: Ushie

.github/workflows/build_pull_request.yml

@@ -3,42 +3,18 @@ name: Build pull request
 on:
   workflow_dispatch:
     inputs:
-      # Select pull request
       pr-number:
-        description: PR number (Without hashtag)
+        description: PR number
         required: true
-      # Select app flavor
       app-flavor:
         description: App flavor
-        default: 'release'
+        default: release
         type: choice
         options:
           - release
           - debug
           - profile
 
-      # Flutter Configurations,
-      # it's recommended to be set when you have problem regarding with flutter itself
-      # For most part you do not need to change this.
-
-      # Flutter version to use, note that the version had to exist in whether channel
-      # to grab
-      # Try using exact version or particular version on a specific branch instead of "any"
-      flutter-channel:
-        description: Flutter channel
-        default: 'stable'
-        type: choice
-        options:
-          - stable
-          - beta
-          - dev
-          - any
-      flutter-version:
-        description: Flutter version
-        default: '3.29.x'
-
-run-name: "Build pull request ${{ inputs.pr-number }}"
-
 jobs:
   build:
     name: Build
@@ -62,76 +38,34 @@ jobs:
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: ${{ inputs.flutter-channel }}
-          flutter-version: ${{ inputs.flutter-version }}
-
+          channel: stable
+          flutter-version: 3.29.x
+          cache: true
+          
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v3
+        with:
+          build-root-directory: ${{ github.workspace }}/android
+          
       - name: Get dependencies
-        continue-on-error: true
         run: flutter pub get
 
       - name: Generate translations
-        continue-on-error: true
         run: dart run slang
 
       - name: Generate code files
-        continue-on-error: true
         run: dart run build_runner build --delete-conflicting-outputs
 
       - name: Build
-        continue-on-error: true
         id: flutter-build
         run: flutter build apk --${{ inputs.app-flavor }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Prepare comment
-        id: prepare-comment # This should work now?
-        run: |
-          echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-          if [[ "${{ steps.flutter-build.outcome }}" == "success" ]]; then
-            MESSAGE="✅ Succeeded build on $COMMIT_HASH."
-          else
-            MESSAGE="🚫 Failed build on $COMMIT_HASH."
-          fi
-
-      - name: "Comment on pull request #${{ inputs.pr-number }}"
-        uses: thollander/actions-comment-pull-request@v3
-        with:
-          github-token: ${{ github.token }}
-          pr-number: ${{ inputs.pr-number }}
-          mode: recreate
-          comment-tag: execution
-          message: |
-            ## ⚒️ Build status
-
-            🧪 Workflow triggered by: ${{ github.actor }}
-
-            ${{ steps.prepare-comment.outputs.MESSAGE }}
-
-            Details: [_Job execution **${{ github.run_id }}** / attempt **${{ github.run_attempt }}**_](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})!
-
-            ### ⚙️ Workflow Steps
-
-            | Step                      | Status                                                   |
-            | :------------------------ | :------------------------------------------------------- |
-            | **Get dependencies**      | ${{ steps.get-dependencies.outcome || job.status }}      |
-            | **Generate translations** | ${{ steps.generate-translations.outcome || job.status }} |
-            | **Generate code files**   | ${{ steps.generate-code-files.outcome || job.status }}   |
-            | **Build**                 | ${{ steps.flutter-build.outcome }}                       |
-
-            ### ⚙️ Workflow Configuration
-
-            | Parameter        | Value                                    |
-            | :--------------- | :--------------------------------------- |
-            | App flavor       | ${{ inputs.app-flavor }}                 |
-            | Flutter version  | ${{ inputs.flutter-version }}            |
-            | Flutter channel  | ${{ inputs.flutter-channel }}            |
-
-      - name: Upload Artifact
+      - name: Upload artifacts
         if: steps.flutter-build.outcome == 'success'
         uses: actions/upload-artifact@v4
         with:
-          name: revanced-manager-(${{ env.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavor }}-${{ inputs.flutter-version }})
+          name: revanced-manager-(${{ env.COMMIT_HASH }}
           path: |
-            build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk
-            build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk.sha1
+            build/app/outputs/flutter-apk/app-*.apk

.github/workflows/open_pull_request.yml

@@ -12,6 +12,8 @@ env:
 jobs:
   pull-request:
     name: Open pull request
+    permissions:
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -25,4 +27,3 @@ jobs:
           pr_body: |
             This pull request will ${{ env.MESSAGE }}.
           pr_draft: true
-          github_token: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

.github/workflows/release.yml

@@ -6,19 +6,13 @@ on:
     branches:
       - main
       - dev
-    paths:
-      - ".github/workflows/release.yml"
-      - "android/**"
-      - "assets/**"
-      - "lib/**"
-      - "pubspec.yaml"
 
 jobs:
   release:
     name: Release
     permissions:
-      id-token: write
       contents: write
+      id-token: write
       attestations: write
     runs-on: ubuntu-latest
     steps:
@@ -28,7 +22,10 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java
-        run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -40,9 +37,16 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: stable
+          flutter-version: 3.29.x
+          cache: true
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v3
+        with:
+          build-root-directory: ${{ github.workspace }}/android
 
       - name: Install dependencies
-        run: npm ci
+        run: npm i
 
       - name: Get dependencies
         run: flutter pub get
@@ -57,17 +61,17 @@ jobs:
         run: |
           echo "${{ secrets.KEYSTORE }}" | base64 --decode > "android/app/keystore.jks"
 
-      - name: Release
+      - name: Semantic Release
+        uses: cycjimmy/semantic-release-action@v4
+        id: semantic
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
           KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
-        run: |
-          npx semantic-release
 
-      - name: Generate artifact attestation
-        if: github.ref == 'refs/heads/main'
-        uses: actions/attest-build-provenance@v1
+      - name: Attest
+        if: steps.semantic.outputs.new_release_published == 'true'
+        uses: actions/attest-build-provenance@v2
         with:
           subject-path: build/app/outputs/apk/release/revanced-manager-*.apk

.github/workflows/sync_crowdin.yml

@@ -15,15 +15,22 @@ jobs:
   sync:
     name: Sync
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          ref: dev
           fetch-depth: 0
+          clean: true
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
+          channel: stable
+          flutter-version: 3.29.x
           cache: true
 
       - name: Sync translations from Crowdin
@@ -34,15 +41,14 @@ jobs:
           upload_translations: false
           download_translations: true
           localization_branch_name: feat/translations
+          skip_ref_checkout: true
           create_pull_request: true
           pull_request_title: "chore: Sync translations"
           pull_request_body: "Sync translations from [crowdin.com/project/revanced](https://crowdin.com/project/revanced)"
           pull_request_base_branch_name: "dev"
           commit_message: "chore: Sync translations"
-          github_user_name: revanced-bot
-          github_user_email: [email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 
@@ -69,8 +75,8 @@ jobs:
 
       - name: Commit translations
         run: |
-          git config user.name revanced-bot
-          git config user.email github@revanced.app
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
           sudo chown -R $USER:$USER .git
           git commit -m "chore: Remove empty values from JSON" assets/i18n/*.i18n.json
           git push origin HEAD:feat/translations

.gitignore

@@ -1,48 +1,58 @@
 # Miscellaneous
 *.class
+*.lock
 *.log
 *.pyc
 *.swp
-.DS_Store
-.atom/
 .buildlog/
 .history
-.svn/
-migrate_working_dir/
+
+# packages file containing multi-root paths
+.packages.generated
 
 # IntelliJ related
 *.iml
 *.ipr
 *.iws
 .idea/
 
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
 # Flutter/Dart/Pub related
 **/doc/api/
-**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
-.pub-cache/
+**/generated_plugin_registrant.dart
+.packages
+.pub-preload-cache/
 .pub/
-/build/
+build/
+flutter_*.png
+linked_*.ds
+unlinked.ds
+unlinked_spec.ds
+
+# Android related
+**/android/**/gradle-wrapper.jar
+.gradle/
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+**/android/key.properties
+*.jks
 
-# Symbolication related
+# Coverage
+coverage/
+
+# Symbols
 app.*.symbols
 
 # Obfuscation related
 app.*.map.json
 
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-
 # Generated files
+android/app/.cxx
 **/*.g.dart
 **/*.locator.dart
 **/*.router.dart

analysis_options.yaml

@@ -15,6 +15,7 @@ analyzer:
     - lib/app/app.router.dart
     - lib/models/patch.g.dart
     - lib/models/patched_application.g.dart
+    - lib/gen/
 
 linter:
   rules:

android/app/proguard-rules.pro

@@ -12,3 +12,6 @@
 -dontwarn com.google.j2objc.annotations.*
 -dontwarn java.awt.**
 -dontwarn javax.**
+
+# Required for Share Plus, ref: ReVanced/revanced-manager#2474
+-keep interface android.content.res.XmlResourceParser { *; }

android/app/src/main/AndroidManifest.xml

@@ -39,6 +39,9 @@
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
+            <meta-data
+                android:name="io.flutter.embedding.android.EnableImpeller"
+                android:value="false" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />