chore: Merge branch dev to main

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+ktlint_code_style = intellij_idea
+ktlint_standard_no-wildcard-imports = disabled

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -6,11 +6,12 @@ body:
   - type: markdown
     attributes:
       value: |
-        # ReVanced Extended Patches bug report
+        # ReVanced Extended bug report
 
         Before creating a new bug report, please keep the following in mind:
 
-        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/YT-Advanced/ReX-patches/labels/Bug%20report).
+        - If your bug is not related to [unique features](https://github.com/anddea/revanced-patches/wiki/Unique-features), open your bug report in [ReVanced](https://github.com/ReVanced/revanced-patches/issues) and [RVX](https://github.com/inotia00/ReVanced_Extended/issues) first.
+        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/anddea/revanced-patches/labels/Bug%20report).
         - **Check if this issue reproduces in unpatched apps as well**: Most bugs can also be reproduced in unpatched apps.
   - type: dropdown
     attributes:
@@ -36,7 +37,7 @@ body:
     attributes:
       label: Application
       description: Write down the application and version where the issue occurs.
-      placeholder: e.g. YouTube v19.02.39
+      placeholder: e.g. YouTube v19.16.39
     validations:
       required: true
   - type: textarea
@@ -48,7 +49,7 @@ body:
         - Add images and videos if possible
         - List used patches if applicable
     validations:
-        required: true
+      required: true
   - type: textarea
     attributes:
       label: Error logs
@@ -73,10 +74,14 @@ body:
       label: Acknowledgements
       description: Your bug report will be closed if you don't follow the checklist below.
       options:
-        - label: This issue does not reproduce on unpatched YouTube or YT Music.
+        - label: This issue does not reproduce on unpatched apps.
           required: true
         - label: This issue is not a duplicate of an existing bug report.
           required: true
+        - label: I did not use any settings marked as `Experimental Flags`.
+          required: true
+        - label: I have patched the APK according to the [documentation](https://github.com/inotia00/revanced-documentation#readme).
+          required: true
         - label: I have chosen an appropriate title.
           required: true
         - label: All requested information has been provided properly.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -6,11 +6,11 @@ body:
   - type: markdown
     attributes:
       value: |
-        # ReVanced Extended Patches feature request
+        # ReVanced Extended feature request
 
         Before creating a new feature request, please keep the following in mind:
 
-        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/YT-Advanced/ReX-patches/labels/Feature%20request).
+        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/anddea/revanced-patches/labels/Feature%20request).
   - type: dropdown
     attributes:
       label: Application
@@ -30,7 +30,7 @@ body:
   - type: textarea
     attributes:
       label: Motivation
-      description: | 
+      description: |
         A strong motivation is necessary for a feature request to be considered.
         
         - Why should this feature be implemented? 

.github/config.yml

@@ -1,2 +1,2 @@
 firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
+  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.

.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly
+
+  - package-ecosystem: npm
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly
+
+  - package-ecosystem: gradle
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly

.github/workflows/build_pull_request.yml

@@ -16,6 +16,12 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v1
 

.github/workflows/open_pull_request.yml

@@ -20,8 +20,9 @@ jobs:
       - name: Open pull request
         uses: repo-sync/pull-request@v2
         with:
-          destination_branch: 'main'
+          destination_branch: main
           pr_title: 'chore: ${{ env.MESSAGE }}'
           pr_body: |
             This pull request will ${{ env.MESSAGE }}.
+
           pr_draft: true

.github/workflows/release.yml

@@ -10,6 +10,11 @@ on:
 jobs:
   release:
     name: Release
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+      packages: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -20,13 +25,20 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v1
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew generateMeta generatePatchesFiles clean
+        # To update `README.md` and `patches.json`, the command `./gradlew generatePatchesFiles clean` should be used instead of the command `./gradlew build clean`
+        run: ./gradlew generatePatchesFiles clean
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -46,5 +58,5 @@ jobs:
 
       - name: Release
         env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npm exec semantic-release

.gitignore

@@ -122,9 +122,12 @@ gradle-app.setting
 # Dependency directories
 node_modules/
 
-# gradle properties, due to Github token
+# Gradle properties, due to Github token
 ./gradle.properties
 
+# One package is called the same as the Gradle build folder
+!**/src/**/build/
+
 .DS_Store
 local.properties
 __pycache__

.releaserc

@@ -24,20 +24,21 @@
           "README.md",
           "CHANGELOG.md",
           "gradle.properties",
-          "patches.json"
-        ]
+          "patches.json",
+        ],
+        "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
     ],
     [
       "@semantic-release/github",
       {
         "assets": [
           {
-            "path": "build/libs/revanced-patches*"
+            "path": "patches/build/libs/patches-!(*sources*|*javadoc*).rvp?(.asc)"
           },
           {
             "path": "patches.json"
-          }
+          },
         ],
         successComment: false
       }