chore(release): 4.0.1-dev.1 [skip ci]

## [4.0.1-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.0.0...v4.0.1-dev.1) (2023-10-07) ### Bug Fixes * Correct warning message ([e4e339d](e4e339dff4))
fix: Correct warning message
2026-01-12 06:16:20 +00:00 · 2023-10-07 00:10:10 +00:00 · 2023-10-07 01:56:13 +02:00 · 2023-10-07 01:56:12 +02:00 · 2023-10-07 01:14:12 +02:00
36 changed files with 3017 additions and 4181 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +0,0 @@
-[*.{kt,kts}]
-ktlint_code_style = intellij_idea
-ktlint_standard_no-wildcard-imports = disabled
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,49 @@
+name: 🐞 Bug report
+description: Report a bug or an issue.
+title: 'bug: '
+labels: ['Bug report']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced CLI bug report
+
+        Please check for existing bug reports
+        [here](https://github.com/ReVanced/revanced-cli/labels/Bug%20report)
+        before creating a new one.
+
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: |
+        - Describe your bug in detail
+        - Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...)
+        - Add images and videos if possible
+        - List used patches if applicable
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Error logs
+      description: Exceptions can be captured by running `logcat | grep AndroidRuntime` in a shell.
+      render: shell
+  - type: textarea
+    attributes:
+      label: Solution
+      description: If applicable, add a possible solution to the bug.
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add additional context here.
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you don't follow the checklist below.
+      options:
+        - label: This request is not a duplicate of an existing issue.
+          required: true
+        - label: I have chosen an appropriate title.
+          required: true
+        - label: All requested information has been provided properly.
+          required: true
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,110 +0,0 @@
-name: 🐞 Bug report
-description: Report a bug or an issue.
-title: 'bug: '
-labels: ['Bug report']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        <p align="center">
-          <picture>
-            <source
-              width="256px"
-              media="(prefers-color-scheme: dark)"
-              srcset="https://raw.githubusercontent.com/revanced/revanced-cli/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
-            >
-            <img 
-              width="256px"
-              src="https://raw.githubusercontent.com/revanced/revanced-cli/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
-            >
-          </picture>
-          <br>
-          <a href="https://revanced.app/">
-             <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-cli/main/assets/revanced-logo/revanced-logo.svg" />
-                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-cli/main/assets/revanced-logo/revanced-logo.svg" />
-             </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://github.com/ReVanced">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="http://revanced.app/discord">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://reddit.com/r/revancedapp">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://t.me/app_revanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://x.com/revancedapp">
-              <picture>
-                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://www.youtube.com/@ReVanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-             </picture>
-           </a>
-           <br>
-           <br>
-           Continuing the legacy of Vanced
-        </p>
-
-        # ReVanced CLI 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/ReVanced/revanced-cli/labels/Bug%20report).
-        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-cli/blob/main/CONTRIBUTING.md).
-        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
-  - type: textarea
-    attributes:
-      label: Bug description
-      description: |
-        - Describe your bug in detail
-        - Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...)
-        - Add images and videos if possible
-        - List used patches if applicable
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Error logs
-      description: Exceptions can be captured by running `logcat | grep AndroidRuntime` in a shell.
-      render: shell
-  - type: textarea
-    attributes:
-      label: Solution
-      description: If applicable, add a possible solution to the bug.
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Your bug report will be closed if you don't follow the checklist below.
-      options:
-        - label: This issue is not a duplicate of an existing bug report.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,45 @@
+name: ⭐ Feature request
+description: Create a detailed request for a new feature.
+title: 'feat: '
+labels: ['Feature request']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced CLI feature request
+
+        Please check for existing feature requests
+        [here](https://github.com/ReVanced/revanced-cli/labels/Feature%20request)
+        before creating a new one.
+
+  - type: textarea
+    attributes:
+      label: Feature description
+      description: |
+        - Describe your feature in detail
+        - Add images, videos, links, examples, references, etc. if possible
+        - Add the target application name in case you request a new patch
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: |
+        A strong motivation is necessary for a feature request to be considered.
+        
+        - Why should this feature be implemented? 
+        - What is the explicit use case?
+        - What are the benefits?
+        - What makes this feature important?
+    validations:
+      required: true
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you don't follow the checklist below.
+      options:
+        - label: This request is not a duplicate of an existing issue.
+          required: true
+        - label: I have chosen an appropriate title.
+          required: true
+        - label: All requested information has been provided properly.
+          required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,106 +0,0 @@
-name: ⭐ Feature request
-description: Create a detailed request for a new feature.
-title: 'feat: '
-labels: ['Feature request']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        <p align="center">
-          <picture>
-            <source
-              width="256px"
-              media="(prefers-color-scheme: dark)"
-              srcset="https://raw.githubusercontent.com/revanced/revanced-cli/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
-            >
-            <img 
-              width="256px"
-              src="https://raw.githubusercontent.com/revanced/revanced-cli/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
-            >
-          </picture>
-          <br>
-          <a href="https://revanced.app/">
-             <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-cli/main/assets/revanced-logo/revanced-logo.svg" />
-                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-cli/main/assets/revanced-logo/revanced-logo.svg" />
-             </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://github.com/ReVanced">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="http://revanced.app/discord">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://reddit.com/r/revancedapp">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://t.me/app_revanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://x.com/revancedapp">
-              <picture>
-                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://www.youtube.com/@ReVanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-             </picture>
-           </a>
-           <br>
-           <br>
-           Continuing the legacy of Vanced
-        </p>
-
-        # ReVanced CLI 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/ReVanced/revanced-cli//labels/Feature%20request).
-        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-cli//blob/main/CONTRIBUTING.md).
-        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
-  - type: textarea
-    attributes:
-      label: Feature description
-      description: |
-        - Describe your feature in detail
-        - Add images, videos, links, examples, references, etc. if possible
-        - Add the target application name in case you request a new patch
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: |
-        A strong motivation is necessary for a feature request to be considered.
-        
-        - Why should this feature be implemented? 
-        - What is the explicit use case?
-        - What are the benefits?
-        - What makes this feature important?
-    validations:
-      required: true
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Your feature request will be closed if you don't follow the checklist below.
-      options:
-        - label: This issue is not a duplicate of an existing feature request.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -1,2 +1,2 @@
 firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
+  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,22 +0,0 @@
-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
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -1,25 +0,0 @@
-name: Build pull request
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - dev
-
-jobs:
-  release:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
-
-      - name: Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build --no-daemon
--- a/.github/workflows/open_pull_request.yml
+++ b/.github/workflows/open_pull_request.yml
@@ -16,7 +16,6 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
-
      - name: Open pull request
        uses: repo-sync/pull-request@v2
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,6 +6,10 @@ on:
    branches:
      - main
      - dev
+  pull_request:
+    branches:
+      - main
+      - dev

 jobs:
  release:
@@ -19,31 +23,23 @@ jobs:
          # https://github.com/cycjimmy/semantic-release-action#private-packages
          persist-credentials: false
          fetch-depth: 0
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
-
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ runner.home }}/.gradle/caches
+            ${{ runner.home }}/.gradle/wrapper
+            .gradle
+            build
+            node_modules
+          key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
      - name: Build
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build clean
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: 'npm'
-
-      - name: Install dependencies
+        # Cleaning is necessary to avoid uploading two identical artifacts with different versions
+        run: ./gradlew clean --no-daemon
+      - name: Setup semantic-release
        run: npm install
-
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          fingerprint: ${{ env.GPG_FINGERPRINT }}
-
      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -11,7 +11,7 @@ jobs:
    name: Dispatch event to documentation repository
    if: github.ref == 'refs/heads/main'
    steps:
-      - uses: peter-evans/repository-dispatch@v3
+      - uses: peter-evans/repository-dispatch@v2
        with:
          token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN  }}
          repository: revanced/revanced-documentation
--- a/.gitignore
+++ b/.gitignore
@@ -119,7 +119,4 @@ node_modules/

 # ReVanced CLI
 revanced-cache/
-options.toml
-
-# Generated by an Android project (such as ReVanced Integrations)
-local.properties
+options.toml
--- a/.releaserc
+++ b/.releaserc
@@ -31,7 +31,7 @@
      {
        "assets": [
          {
-            "path": "build/libs/*-all*"
+            "path": "build/libs/*all.jar"
          }
        ],
        successComment: false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,168 +1,3 @@
-## [4.4.1](https://github.com/ReVanced/revanced-cli/compare/v4.4.0...v4.4.1) (2024-03-06)
-
-
-### Bug Fixes
-
-* Bump dependencies to support BCS keystore ([1c10a77](https://github.com/ReVanced/revanced-cli/commit/1c10a7760d76ea850260ca49b448be7ad121de44))
-
-## [4.4.1-dev.2](https://github.com/ReVanced/revanced-cli/compare/v4.4.1-dev.1...v4.4.1-dev.2) (2024-03-04)
-
-
-### Bug Fixes
-
-* Bump dependencies to support BCS keystore ([1c10a77](https://github.com/ReVanced/revanced-cli/commit/1c10a7760d76ea850260ca49b448be7ad121de44))
-
-## [4.4.1-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.4.0...v4.4.1-dev.1) (2024-02-21)
-
-# [4.4.0](https://github.com/ReVanced/revanced-cli/compare/v4.3.0...v4.4.0) (2023-12-28)
-
-
-### Bug Fixes
-
-* Add missing punctuation in command description ([8210351](https://github.com/ReVanced/revanced-cli/commit/821035107d7264580275f395e9e3fcef91394afd))
-
-
-### Features
-
-* Log saved patched APK file path ([16109bd](https://github.com/ReVanced/revanced-cli/commit/16109bd8bc6236debf71cbc8db78fe452b2ed00d))
-
-# [4.4.0-dev.2](https://github.com/ReVanced/revanced-cli/compare/v4.4.0-dev.1...v4.4.0-dev.2) (2023-12-18)
-
-
-### Bug Fixes
-
-* Add missing punctuation in command description ([8210351](https://github.com/ReVanced/revanced-cli/commit/821035107d7264580275f395e9e3fcef91394afd))
-
-# [4.4.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.3.0...v4.4.0-dev.1) (2023-12-01)
-
-
-### Features
-
-* Log saved patched APK file path ([16109bd](https://github.com/ReVanced/revanced-cli/commit/16109bd8bc6236debf71cbc8db78fe452b2ed00d))
-
-# [4.3.0](https://github.com/ReVanced/revanced-cli/compare/v4.2.0...v4.3.0) (2023-12-01)
-
-
-### Features
-
-* Add `list-versions` command ([a974b8e](https://github.com/ReVanced/revanced-cli/commit/a974b8ea80acd85f8dc472a3f93b8fd7bea08007))
-
-# [4.3.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.2.0...v4.3.0-dev.1) (2023-11-27)
-
-
-### Features
-
-* Add `list-versions` command ([a974b8e](https://github.com/ReVanced/revanced-cli/commit/a974b8ea80acd85f8dc472a3f93b8fd7bea08007))
-
-# [4.2.0](https://github.com/ReVanced/revanced-cli/compare/v4.1.0...v4.2.0) (2023-11-26)
-
-
-### Bug Fixes
-
-* Fix typo ([#300](https://github.com/ReVanced/revanced-cli/issues/300)) ([9d96bb7](https://github.com/ReVanced/revanced-cli/commit/9d96bb7b4cc4538da416db50bd689af1a632fc45))
-
-
-### Features
-
-* Allow selecting first Adb device, if none supplied automatically by updating dependencies ([e7c3d64](https://github.com/ReVanced/revanced-cli/commit/e7c3d64bf15bf84f3853e7ef699511bf72c13767))
-* Exit application with CLI exit code ([36c6a6a](https://github.com/ReVanced/revanced-cli/commit/36c6a6a5f75f2e770a7941b3f83f430f62de13de))
-* Make `--out´ option optional ([3765957](https://github.com/ReVanced/revanced-cli/commit/3765957043989fe7a8932a0c548566a78d04fc41))
-
-# [4.2.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.1.1-dev.1...v4.2.0-dev.1) (2023-11-26)
-
-
-### Features
-
-* Allow selecting first Adb device, if none supplied automatically by updating dependencies ([e7c3d64](https://github.com/ReVanced/revanced-cli/commit/e7c3d64bf15bf84f3853e7ef699511bf72c13767))
-* Exit application with CLI exit code ([36c6a6a](https://github.com/ReVanced/revanced-cli/commit/36c6a6a5f75f2e770a7941b3f83f430f62de13de))
-* Make `--out´ option optional ([3765957](https://github.com/ReVanced/revanced-cli/commit/3765957043989fe7a8932a0c548566a78d04fc41))
-
-## [4.1.1-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.1.0...v4.1.1-dev.1) (2023-11-25)
-
-
-### Bug Fixes
-
-* Fix typo ([#300](https://github.com/ReVanced/revanced-cli/issues/300)) ([9d96bb7](https://github.com/ReVanced/revanced-cli/commit/9d96bb7b4cc4538da416db50bd689af1a632fc45))
-
-# [4.1.0](https://github.com/ReVanced/revanced-cli/compare/v4.0.2...v4.1.0) (2023-11-04)
-
-
-### Features
-
-* Include or exclude patches by their index in relation to supplied patch bundles ([b2055ce](https://github.com/ReVanced/revanced-cli/commit/b2055ce07df3ab9a9f3f73ab17d8c2cf02f2ae62))
-* List patches which are compatible with any app ([#297](https://github.com/ReVanced/revanced-cli/issues/297)) ([0139dfe](https://github.com/ReVanced/revanced-cli/commit/0139dfe0bfa06a13f56dc03e7718aaf644029614))
-
-
-### Performance Improvements
-
-* Use a `HashSet` to check for included and excluded patches ([616d14f](https://github.com/ReVanced/revanced-cli/commit/616d14f0097c1ee7ba6dc07be417590f6418e8e5))
-
-# [4.1.0-dev.3](https://github.com/ReVanced/revanced-cli/compare/v4.1.0-dev.2...v4.1.0-dev.3) (2023-11-03)
-
-# [4.1.0-dev.2](https://github.com/ReVanced/revanced-cli/compare/v4.1.0-dev.1...v4.1.0-dev.2) (2023-11-03)
-
-
-### Features
-
-* Include or exclude patches by their index in relation to supplied patch bundles ([b2055ce](https://github.com/ReVanced/revanced-cli/commit/b2055ce07df3ab9a9f3f73ab17d8c2cf02f2ae62))
-
-
-### Performance Improvements
-
-* Use a `HashSet` to check for included and excluded patches ([616d14f](https://github.com/ReVanced/revanced-cli/commit/616d14f0097c1ee7ba6dc07be417590f6418e8e5))
-
-# [4.1.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.0.3-dev.2...v4.1.0-dev.1) (2023-11-03)
-
-
-### Features
-
-* List patches which are compatible with any app ([#297](https://github.com/ReVanced/revanced-cli/issues/297)) ([0139dfe](https://github.com/ReVanced/revanced-cli/commit/0139dfe0bfa06a13f56dc03e7718aaf644029614))
-
-## [4.0.3-dev.2](https://github.com/ReVanced/revanced-cli/compare/v4.0.3-dev.1...v4.0.3-dev.2) (2023-10-30)
-
-## [4.0.3-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.0.2...v4.0.3-dev.1) (2023-10-23)
-
-## [4.0.2](https://github.com/ReVanced/revanced-cli/compare/v4.0.1...v4.0.2) (2023-10-12)
-
-
-### Bug Fixes
-
-* Move file to output even when mounting ([59dfc98](https://github.com/ReVanced/revanced-cli/commit/59dfc988e351374eb718923d19bd9bdd94e8d3c0))
-* Use punctuation in option descriptions ([da4469f](https://github.com/ReVanced/revanced-cli/commit/da4469f402c26ad95898404236b0acf0202907e2))
-
-
-### Performance Improvements
-
-* Use multiple threads for writing dex files ([28648a1](https://github.com/ReVanced/revanced-cli/commit/28648a1c53520eef8c799504ff61a35947f878b8))
-
-## [4.0.2-dev.3](https://github.com/ReVanced/revanced-cli/compare/v4.0.2-dev.2...v4.0.2-dev.3) (2023-10-10)
-
-
-### Bug Fixes
-
-* Move file to output even when mounting ([59dfc98](https://github.com/ReVanced/revanced-cli/commit/59dfc988e351374eb718923d19bd9bdd94e8d3c0))
-
-## [4.0.2-dev.2](https://github.com/ReVanced/revanced-cli/compare/v4.0.2-dev.1...v4.0.2-dev.2) (2023-10-10)
-
-
-### Performance Improvements
-
-* Use multiple threads for writing dex files ([28648a1](https://github.com/ReVanced/revanced-cli/commit/28648a1c53520eef8c799504ff61a35947f878b8))
-
-## [4.0.2-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.0.1...v4.0.2-dev.1) (2023-10-08)
-
-
-### Bug Fixes
-
-* Use punctuation in option descriptions ([da4469f](https://github.com/ReVanced/revanced-cli/commit/da4469f402c26ad95898404236b0acf0202907e2))
-
-## [4.0.1](https://github.com/ReVanced/revanced-cli/compare/v4.0.0...v4.0.1) (2023-10-08)
-
-
-### Bug Fixes
-
-* Correct warning message ([ba573f7](https://github.com/ReVanced/revanced-cli/commit/ba573f73d0e310fdeb8be2831fd40a7188473fff))
-
 ## [4.0.1-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.0.0...v4.0.1-dev.1) (2023-10-07)


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,72 +6,53 @@
      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
    >
    <img 
-      width="256px"
      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
    >
  </picture>
  <br>
  <a href="https://revanced.app/">
-     <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
-         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
-     </picture>
+       <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/ReVanced">
+   <a href="https://github.com/revanced">
       <picture>
           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="http://revanced.app/discord">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-       </picture>
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://reddit.com/r/revancedapp">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-       </picture>
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://t.me/app_revanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-      </picture>
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://x.com/revancedapp">
-      <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-      </picture>
+   <a href="https://twitter.com/revancedapp">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032018-6da37214-7474-4641-a1da-7af7db3a31cd.png" />
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://www.youtube.com/@ReVanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-     </picture>
-   </a>
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+   </a>&nbsp;&nbsp;&nbsp;
   <br>
   <br>
   Continuing the legacy of Vanced
 </p>

-# 👋 Contribution guidelines
+# 📙 ReVanced CLI contribution guidelines

 This document describes how to contribute to ReVanced CLI.

 ## 📖 Resources to help you get started

- The [documentation](/docs) explains how to use ReVanced CLI
- [Our backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
- [Issues](https://github.com/ReVanced/revanced-cli/issues) are where we keep track of bugs and feature requests
+* The [documentation](/docs) explains how to use ReVanced CLI
+* [Our backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
+* [Issues](https://github.com/ReVanced/revanced-cli/issues) are where we keep track of bugs and feature requests

 ## 🙏 Submitting a feature request

 Features can be requested by opening an issue using the
-[Feature request issue template](https://github.com/ReVanced/revanced-cli/issues/new?assignees=&labels=Feature+request&projects=&template=feature_request.yml&title=feat%3A+).
+[Feature request issue template](https://github.com/ReVanced/revanced-cli/issues/new?assignees=&labels=Feature+request&projects=&template=feature-request.yml&title=feat%3A+).

 > **Note**
 > Requests can be accepted or rejected at the discretion of maintainers of ReVanced CLI.
@@ -80,7 +61,7 @@ Features can be requested by opening an issue using the
 ## 🐞 Submitting a bug report

 If you encounter a bug while using ReVanced CLI, open an issue using the
-[Bug report issue template](https://github.com/ReVanced/revanced-cli/issues/new?assignees=&labels=Bug+report&projects=&template=bug_report.yml&title=bug%3A+).
+[Bug report issue template](https://github.com/ReVanced/revanced-cli/issues/new?assignees=&labels=Bug+report&projects=&template=bug-report.yml&title=bug%3A+).

 ## 📝 How to contribute

@@ -88,11 +69,11 @@ If you encounter a bug while using ReVanced CLI, open an issue using the
   with the maintainers of ReVanced CLI. This will help you determine whether your change is acceptable
   and whether it is worth your time to implement it
 2. Development happens on the `dev` branch. Fork the repository and create your branch from `dev`
-3. Commit your changes
+3. Commit your changes.
 4. Submit a pull request to the `dev` branch of the repository and reference issues
   that your pull request closes in the description of your pull request
 5. Our team will review your pull request and provide feedback. Once your pull request is approved,
   it will be merged into the `dev` branch and will be included in the next release of ReVanced CLI

-❤️ Thank you for considering contributing to ReVanced CLI,  
-ReVanced
+❤️ Thank you for considering contributing to ReVanced CLI,
+ReVanced
--- a/README.md
+++ b/README.md
@@ -6,58 +6,40 @@
      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
    >
    <img 
-      width="256px"
      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
    >
  </picture>
  <br>
  <a href="https://revanced.app/">
-     <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
-         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
-     </picture>
+       <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/ReVanced">
+   <a href="https://github.com/revanced">
       <picture>
           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="http://revanced.app/discord">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-       </picture>
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://reddit.com/r/revancedapp">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-       </picture>
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://t.me/app_revanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-      </picture>
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://x.com/revancedapp">
-      <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-      </picture>
+   <a href="https://twitter.com/revancedapp">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032018-6da37214-7474-4641-a1da-7af7db3a31cd.png" />
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://www.youtube.com/@ReVanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-     </picture>
-   </a>
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+   </a>&nbsp;&nbsp;&nbsp;
   <br>
   <br>
   Continuing the legacy of Vanced
 </p>

+
 # 💻 ReVanced CLI

 ![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-cli/release.yml)
@@ -67,23 +49,13 @@ Command line application to use ReVanced.

 ## ❓ About

-ReVanced CLI is a command line application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.
+ReVanced CLI is a command line application to patch apps using ReVanced.
+ReVanced CLI also comes with commands to uninstall or install patched apps and list patches from supplied patch bundles.

-## 💪 Features
+## 🚀 Download

-Some of the features ReVanced CLI provides are:
-
- 💉 **Patch apps**: Harness ReVanced Patcher to patch Android apps
- 💾 **Install and uninstall apps**: Install and uninstall Apps via ADB,
-  using the Android package manager, or by mounting using root permissions
- 📃 **List patches from patch bundles**: List available patches, compatible packages, and versions
- 💪 **Flexibility and functionality**: Apply any combination of patches to any version of Android apps
-
-## 🔽 Download
-
-You can download the most recent version of ReVanced CLI from
-[here](https://github.com/ReVanced/revanced-cli/releases/latest).  
-Learn how to use ReVanced CLI by following the [documentation](/docs).
+You can download the most recent version of ReVanced CLI from 
+[here](https://github.com/ReVanced/revanced-cli/releases/latest). Learn how to use ReVanced CLI by following the [documentation](/docs).

 ## 📚 Everything else

@@ -94,14 +66,10 @@ You can find the contribution guidelines [here](CONTRIBUTING.md).

 ### 🛠️ Building

-To build a ReVanced CLI, you can follow the [documentation](/docs).
-
-### 📃 Documentation
-
-You can find the documentation of ReVanced CLI [here](/docs).
+In order to build ReVanced CLI, you can follow the [documentation](/docs).

 ## 📜 Licence

-ReVanced CLI is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.
+ReVanced CLI is licensed under the GPLv3 licence. Please see the [licence file](LICENSE) for more information.
 [tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced CLI as long as you track changes/dates in source files.
-Any modifications to ReVanced CLI must also be made available under the GPL, along with build & install instructions.
+Any modifications to ReVanced CLI must also be made available under the GPL along with build & install instructions.
--- a/assets/revanced-logo/revanced-logo-round.svg
+++ b/assets/revanced-logo/revanced-logo-round.svg
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,33 +1,10 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
-    alias(libs.plugins.kotlin)
+    kotlin("jvm") version "1.9.0"
    alias(libs.plugins.shadow)
-    application
-    `maven-publish`
-    signing
 }

 group = "app.revanced"

-application {
-    mainClass = "app.revanced.cli.command.MainCommandKt"
-}
-
-repositories {
-    mavenCentral()
-    mavenLocal()
-    google()
-    maven {
-        // A repository must be speficied for some reason. "registry" is a dummy.
-        url = uri("https://maven.pkg.github.com/revanced/registry")
-        credentials {
-            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
-            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
-        }
-    }
-}
-
 dependencies {
    implementation(libs.revanced.patcher)
    implementation(libs.revanced.library)
@@ -37,15 +14,7 @@ dependencies {
    testImplementation(libs.kotlin.test)
 }

-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-}
+kotlin { jvmToolchain(11) }

 tasks {
    test {
@@ -60,6 +29,9 @@ tasks {
    }

    shadowJar {
+        manifest {
+            attributes("Main-Class" to "app.revanced.cli.command.MainCommandKt")
+        }
        minimize {
            exclude(dependency("org.jetbrains.kotlin:.*"))
            exclude(dependency("org.bouncycastle:.*"))
@@ -67,29 +39,25 @@ tasks {
        }
    }

-    publish {
+    build {
        dependsOn(shadowJar)
    }
-}

-// Needed by gradle-semantic-release-plugin.
-// Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    /*
+    Dummy task to hack gradle-semantic-release-plugin to release this project.

-// The maven-publish is also necessary to make the signing plugin work.
-publishing {
-    repositories {
-        mavenLocal()
-    }
+    Explanation:
+    SemVer is a standard for versioning libraries.
+    For that reason the semantic-release plugin uses the "publish" task to publish libraries.
+    However, this subproject is not a library, and the "publish" task is not available for this subproject.
+    Because semantic-release is not designed to handle this case, we need to hack it.

-    publications {
-        create<MavenPublication>("revanced-cli-publication") {
-            from(components["java"])
-        }
+    RE: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+     */
+
+    register<DefaultTask>("publish") {
+        group = "publishing"
+        description = "Dummy task to hack gradle-semantic-release-plugin to release ReVanced CLI"
+        dependsOn(build)
    }
 }
-
-signing {
-    useGpgCmd()
-
-    sign(publishing.publications["revanced-cli-publication"])
-}
--- a/docs/0_prerequisites.md
+++ b/docs/0_prerequisites.md
@@ -1,12 +1,14 @@
 # 💼 Prerequisites

-To use ReVanced CLI, you will need to fulfill specific requirements.
+To use ReVanced CLI, you will need to fulfil specific requirements.

 ## 🤝 Requirements

- Java Runtime Environment 11 ([Azul Zulu JRE](https://www.azul.com/downloads/?version=java-11-lts&package=jdk#zulu) or [OpenJDK](https://jdk.java.net/archive/))
- [Android Debug Bridge (ADB)](https://developer.android.com/studio/command-line/adb) if you want to install the patched APK file on your device
+- Java SDK 11 (Azul Zulu JDK or OpenJDK)
+- [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb) if you want to install the patched APK file on your device
 - An ABI other than ARMv7 such as x86 or x86-64 (or a custom AAPT binary that supports ARMv7)
+- ReVanced Patches
+- ReVanced Integrations, if the patches require it

 ## ⏭️ Whats next

--- a/docs/1_usage.md
+++ b/docs/1_usage.md
@@ -1,18 +1,37 @@
 # 🛠️ Using ReVanced CLI

-Learn how to use ReVanced CLI.
+Learn how to ReVanced CLI.

-## 🔨 Usage
+## ⚡ Setup ADB

-ReVanced CLI is divided into the following fundamental commands:
+1. Ensure that ADB is working

- ### 🚀 Show all available options for ReVanced CLI
+   ```bash
+   adb shell exit
+   ```
+
+   Optionally, you can install the patched APK file on your device by mounting it on top of the original APK file. 
+   You will need root permissions for this. Check if you have root permissions by running the following command:
+
+   ```bash
+   adb shell su -c exit
+   ```
+
+2. Get your device's serial
+
+   ```bash
+   adb devices
+   ```
+
+## 🔨 Using ReVanced CLI
+
+- ### ⚙️ Show all available options for ReVanced CLI

  ```bash
  java -jar revanced-cli.jar -h
  ```

- ### 📃 List patches
+- ### 📃 List patches from supplied patch bundles

  ```bash
  java -jar revanced-cli.jar list-patches \
@@ -22,11 +41,11 @@ ReVanced CLI is divided into the following fundamental commands:
   revanced-patches.jar [<patch-bundle> ...]
  ```

- ### ⚙️ Generate options
+- ### ⚙️ Generate options from patches using ReVanced CLI

  This will generate an `options.json` file for the patches from a list of supplied patch bundles.
  The file can be supplied to ReVanced CLI later on.
-
+ 
  ```bash
  java -jar revanced-cli.jar options \
   --path options.json \
@@ -34,96 +53,59 @@ ReVanced CLI is divided into the following fundamental commands:
   revanced-patches.jar [<patch-bundle> ...]
  ```

-  > **ℹ️ Note**  
-  > A default `options.json` file will be automatically created if it does not exist
-  > without any need for intervention when using the `patch` command.
+  > **Note**: A default `options.json` file will be automatically generated, if it does not exist 
+  without any need for intervention when using the `patch` command.

- ### 💉 Patch an app
+- ### 💉 Use ReVanced CLI to patch an APK file but install without root permissions

-  You can patch apps by supplying patch bundles and the app to patch.
-  After patching, ReVanced CLI can install the patched app on your device using two methods:
+  This will install the patched APK file regularly on your device.

-  > **💡 Tip**  
-  > For ReVanced CLI to be able to install the patched app on your device, make sure ADB is working:
-  >
-  > ```bash
-  > adb shell exit
-  > ```
-  >
-  > If you want to mount the patched app on top of the un-patched app, make sure you have root permissions:
-  >
-  > ```bash
-  > adb shell su -c exit
-  > ```
+  ```bash
+  java -jar revanced-cli.jar patch \
+   --patch-bundle revanced-patches.jar \
+   --out output.apk \
+   --device-serial <device-serial> \
+   input.apk
+  ```

-  > **⚠️ Warning**  
-  > Some patches may require integrations
-  > such as [ReVanced Integrations](https://github.com/revanced/revanced-integrations).
-  > Supply them with the option `--merge`. ReVanced Patcher will automatically determine if they are necessary.
+- ### 👾 Use ReVanced CLI to patch an APK file but install with root permissions

-  - #### 👾 Patch an app and install it on your device regularly
+  This will install the patched APK file on your device by mounting it on top of the original APK file.

-    ```bash
-    java -jar revanced-cli.jar patch \
-     --patch-bundle revanced-patches.jar \
-     -d \
-     input.apk
-    ```
+  ```bash
+  adb install input.apk
+  java -jar revanced-cli.jar patch \
+   --patch-bundle revanced-patches.jar \
+   --include some-other-patch \
+   --exclude some-patch \
+   --out patched-output.apk \
+   --device-serial <device-serial> \
+   --mount \
+   input.apk
+  ```

-  - #### 👾 Patch an app and mount it on top of the un-patched app with root permissions
-
-    > **❗ Caution**  
-    > Ensure that the same app you are patching and mounting over is installed on your device:
-    >
-    > ```bash
-    > adb install app.apk
-    > ```
-
-    ```bash
-    java -jar revanced-cli.jar patch \
-     --patch-bundle revanced-patches.jar \
-     --include "Some patch" \
-     --ii 123 \
-     --exclude "Some other patch" \
-     -d \
-     --mount \
-     app.apk
-    ```
-
-    > **💡 Tip**  
-    > You can use the option `--ii` to include or `--ie` to exclude
-    > patches by their index in relation to supplied patch bundles,
-    > similarly to the option `--include` and `--exclude`.
-    >
-    > This is useful in case two patches have the same name, and you must include or exclude one.  
-    > The patch index is calculated by the position of the patch in the list of patches
-    > from patch bundles supplied using the option `--patch-bundle`.
-    >
-    > You can list all patches with their indices using the command `list-patches`.
-    >
-    > Keep in mind that the indices can change based on the order of the patch bundles supplied,
-    > as well if the patch bundles are updated because patches can be added or removed.
-
- ### 🗑️ Uninstall an app
+  > **Note**: Some patches may require integrations
+  such as [ReVanced Integrations](https://github.com/revanced/revanced-integrations). 
+  Supply them with the option `--merge`. If any patches accepted by ReVanced Patcher require ReVanced Integrations, 
+  they will be merged into the APK file automatically.

+- ### 🗑️ Uninstall a patched APK file
  ```bash
  java -jar revanced-cli.jar utility uninstall \
   --package-name <package-name> \
-   [<device-serial>]
+   <device-serial>
  ```

-  > **💡 Tip**  
-  > You can unmount an APK file
-  > by adding the option `--unmount`.
+  > **Note**: You can unmount an APK file
+  with the option `--unmount`.

- ### ️ 📦 Install an app
+- ### ️ ⚙️ Manually install an APK file

  ```bash
  java -jar revanced-cli.jar utility install \
   -a input.apk \
-   [<device-serial>]
+   <device-serial>
  ```

-  > **💡 Tip**  
-  > You can mount an APK file
-  > by supplying the app's package name to mount the supplied APK file over the option `-mount`.
+  > **Note**: You can mount an APK file 
+  by supplying the package name of the app to mount the supplied APK file to over the option `--mount`.
--- a/docs/2_building.md
+++ b/docs/2_building.md
@@ -1,26 +0,0 @@
-# 🔨️ Building
-
-Build ReVanced CLI from source.
-
-## 📝 Requirements
-
- Java Development Kit 11 (Azul Zulu JRE or OpenJDK)
-
-## 🏗️ Building
-
-To build ReVanced CLI, follow these steps:
-
-1. Clone the repository:
-
-   ```bash
-   git clone git@github.com:ReVanced/revanced-cli.git
-   cd revanced-cli
-   ```
-
-2. Build the project:
-
-   ```bash
-    ./gradlew build
-   ```
-
-After the build succeeds, the built JAR file will be located at `build/libs/revanced-cli-<version>-all.jar`.
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,9 +1,8 @@
 # 💻 Documentation and guides of ReVanced CLI

-This documentation contains topics around [ReVanced CLI](https://github.com/revanced/revanced-cli).
+This documentation explains how to use [ReVanced CLI](https://github.com/revanced/revanced-cli).

 ## 📖 Table of contents

 1. [💼 Prerequisites](0_prerequisites.md)
 2. [🛠️ Using ReVanced CLI](1_usage.md)
-3. [🔨 Building ReVanced CLI](2_building.md)
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.4.1
+version = 4.0.1-dev.1
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
 shadow = "8.1.1"
-kotlin = "1.9.22"
+kotlin-test = "1.8.20-RC"
 kotlinx-coroutines-core = "1.7.3"
-picocli = "4.7.5"
-revanced-patcher = "19.3.1"
-revanced-library = "2.1.0"
+picocli = "4.7.3"
+revanced-patcher = "16.0.2"
+revanced-library = "1.1.2"

 [libraries]
-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-test" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
 picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
 revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
@@ -15,4 +15,3 @@ revanced-library = { module = "app.revanced:revanced-library", version.ref = "re

 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
-kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dist
+zipStorePath=wrapper/dists
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
  "devDependencies": {
-    "@saithodev/semantic-release-backmerge": "^4.0.1",
-    "@semantic-release/changelog": "^6.0.3",
+    "@saithodev/semantic-release-backmerge": "^3.1.0",
+    "@semantic-release/changelog": "^6.0.2",
    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.9.1",
-    "semantic-release": "^23.0.2"
+    "gradle-semantic-release-plugin": "^1.7.6",
+    "semantic-release": "^20.1.0"
  }
 }
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,23 @@
-rootProject.name = "revanced-cli"
+val githubUsername: String = providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR")
+val githubPassword: String = providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN")

-buildCache {
-    local {
-        isEnabled = "CI" !in System.getenv()
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        google()
+        maven { url = uri("https://jitpack.io") }
+        listOf("revanced-patcher", "jadb").forEach { repo ->
+            maven {
+                url = uri("https://maven.pkg.github.com/revanced/$repo")
+                credentials {
+                    username = githubUsername
+                    password = githubPassword
+                }
+            }
+        }
    }
 }
+
+rootProject.name = "revanced-cli"
--- a/src/main/kotlin/app/revanced/cli/command/ListCompatibleVersions.kt
+++ b/src/main/kotlin/app/revanced/cli/command/ListCompatibleVersions.kt
@@ -1,67 +0,0 @@
-package app.revanced.cli.command
-
-import app.revanced.library.PackageName
-import app.revanced.library.PatchUtils
-import app.revanced.library.VersionMap
-import app.revanced.patcher.PatchBundleLoader
-import picocli.CommandLine
-import java.io.File
-import java.util.logging.Logger
-
-@CommandLine.Command(
-    name = "list-versions",
-    description = [
-        "List the most common compatible versions of apps that are compatible " +
-            "with the patches in the supplied patch bundles.",
-    ],
-)
-internal class ListCompatibleVersions : Runnable {
-    private val logger = Logger.getLogger(ListCompatibleVersions::class.java.name)
-
-    @CommandLine.Parameters(
-        description = ["Paths to patch bundles."],
-        arity = "1..*",
-    )
-    private lateinit var patchBundles: Array<File>
-
-    @CommandLine.Option(
-        names = ["-f", "--filter-package-names"],
-        description = ["Filter patches by package name."],
-    )
-    private var packageNames: Set<String>? = null
-
-    @CommandLine.Option(
-        names = ["-u", "--count-unused-patches"],
-        description = ["Count patches that are not used by default."],
-        showDefaultValue = CommandLine.Help.Visibility.ALWAYS,
-    )
-    private var countUnusedPatches: Boolean = false
-
-    override fun run() {
-        val patches = PatchBundleLoader.Jar(*patchBundles)
-
-        fun VersionMap.buildVersionsString(): String {
-            if (isEmpty()) return "Any"
-
-            fun buildPatchesCountString(count: Int) = if (count == 1) "1 patch" else "$count patches"
-
-            return entries.joinToString("\n") { (version, count) ->
-                "$version (${buildPatchesCountString(count)})"
-            }
-        }
-
-        fun buildString(entry: Map.Entry<PackageName, VersionMap>) =
-            buildString {
-                val (name, versions) = entry
-                appendLine("Package name: $name")
-                appendLine("Most common compatible versions:")
-                appendLine(versions.buildVersionsString().prependIndent("\t"))
-            }
-
-        PatchUtils.getMostCommonCompatibleVersions(
-            patches,
-            packageNames,
-            countUnusedPatches,
-        ).entries.joinToString("\n", transform = ::buildString).let(logger::info)
-    }
-}
--- a/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt
@@ -8,132 +8,92 @@ import picocli.CommandLine.Help.Visibility.ALWAYS
 import java.io.File
 import java.util.logging.Logger

-@Command(
-    name = "list-patches",
-    description = ["List patches from supplied patch bundles."],
-)
+
+@Command(name = "list-patches", description = ["List patches from supplied patch bundles"])
 internal object ListPatchesCommand : Runnable {
    private val logger = Logger.getLogger(ListPatchesCommand::class.java.name)

    @Parameters(
-        description = ["Paths to patch bundles."],
-        arity = "1..*",
+        description = ["Paths to patch bundles"], arity = "1..*"
    )
    private lateinit var patchBundles: Array<File>

    @Option(
-        names = ["-d", "--with-descriptions"],
-        description = ["List their descriptions."],
-        showDefaultValue = ALWAYS,
+        names = ["-d", "--with-descriptions"], description = ["List their descriptions"], showDefaultValue = ALWAYS
    )
    private var withDescriptions: Boolean = true

    @Option(
        names = ["-p", "--with-packages"],
-        description = ["List the packages the patches are compatible with."],
-        showDefaultValue = ALWAYS,
+        description = ["List the packages the patches are compatible with"],
+        showDefaultValue = ALWAYS
    )
    private var withPackages: Boolean = false

    @Option(
        names = ["-v", "--with-versions"],
-        description = ["List the versions of the apps the patches are compatible with."],
-        showDefaultValue = ALWAYS,
+        description = ["List the versions of the apps the patches are compatible with"],
+        showDefaultValue = ALWAYS
    )
    private var withVersions: Boolean = false

    @Option(
-        names = ["-o", "--with-options"],
-        description = ["List the options of the patches."],
-        showDefaultValue = ALWAYS,
+        names = ["-o", "--with-options"], description = ["List the options of the patches"], showDefaultValue = ALWAYS
    )
    private var withOptions: Boolean = false

    @Option(
-        names = ["-u", "--with-universal-patches"],
-        description = ["List patches which are compatible with any app."],
-        showDefaultValue = ALWAYS,
-    )
-    private var withUniversalPatches: Boolean = true
-
-    @Option(
-        names = ["-i", "--index"],
-        description = ["List the index of each patch in relation to the supplied patch bundles."],
-        showDefaultValue = ALWAYS,
-    )
-    private var withIndex: Boolean = true
-
-    @Option(
-        names = ["-f", "--filter-package-name"],
-        description = ["Filter patches by package name."],
+        names = ["-f", "--filter-package-name"], description = ["Filter patches by package name"]
    )
    private var packageName: String? = null

    override fun run() {
-        fun Patch.CompatiblePackage.buildString() =
-            buildString {
-                if (withVersions && versions != null) {
-                    appendLine("Package name: $name")
-                    appendLine("Compatible versions:")
-                    append(versions!!.joinToString("\n") { version -> version }.prependIndent("\t"))
-                } else {
-                    append("Package name: $name")
-                }
+        fun Patch.CompatiblePackage.buildString() = buildString {
+            if (withVersions && versions != null) {
+                appendLine("Package name: $name")
+                appendLine("Compatible versions:")
+                append(versions!!.joinToString("\n") { version -> version }.prependIndent("\t"))
+            } else append("Package name: $name")
+        }
+
+        fun PatchOption<*>.buildString() = buildString {
+            appendLine("Title: $title")
+            appendLine("Description: $description")
+
+            value?.let {
+                appendLine("Key: $key")
+                append("Value: $it")
+            } ?: append("Key: $key")
+        }
+
+        fun Patch<*>.buildString() = buildString {
+            append("Name: $name")
+
+            if (withDescriptions) append("\nDescription: $description")
+
+            if (withOptions && options.isNotEmpty()) {
+                appendLine("\nOptions:")
+                append(
+                    options.values.joinToString("\n\n") { option ->
+                        option.buildString()
+                    }.prependIndent("\t")
+                )
            }

-        fun PatchOption<*>.buildString() =
-            buildString {
-                appendLine("Title: $title")
-                description?.let { appendLine("Description: $it") }
-                default?.let {
-                    appendLine("Key: $key")
-                    append("Default: $it")
-                } ?: append("Key: $key")
-
-                values?.let { values ->
-                    appendLine("\nValid values:")
-                    append(values.map { "${it.value} (${it.key})" }.joinToString("\n").prependIndent("\t"))
-                }
+            if (withPackages && compatiblePackages != null) {
+                appendLine("\nCompatible packages:")
+                append(
+                    compatiblePackages!!.joinToString("\n") { it.buildString() }.prependIndent("\t")
+                )
            }
+        }

-        fun IndexedValue<Patch<*>>.buildString() =
-            let { (index, patch) ->
-                buildString {
-                    if (withIndex) appendLine("Index: $index")
+        fun Patch<*>.anyPackageName(name: String) = compatiblePackages?.any { it.name == name } == true

-                    append("Name: ${patch.name}")
+        val patches = PatchBundleLoader.Jar(*patchBundles)

-                    if (withDescriptions) append("\nDescription: ${patch.description}")
-
-                    if (withOptions && patch.options.isNotEmpty()) {
-                        appendLine("\nOptions:")
-                        append(
-                            patch.options.values.joinToString("\n\n") { option ->
-                                option.buildString()
-                            }.prependIndent("\t"),
-                        )
-                    }
-
-                    if (withPackages && patch.compatiblePackages != null) {
-                        appendLine("\nCompatible packages:")
-                        append(
-                            patch.compatiblePackages!!.joinToString("\n") {
-                                it.buildString()
-                            }.prependIndent("\t"),
-                        )
-                    }
-                }
-            }
-
-        fun Patch<*>.filterCompatiblePackages(name: String) =
-            compatiblePackages?.any { it.name == name }
-                ?: withUniversalPatches
-
-        val patches = PatchBundleLoader.Jar(*patchBundles).withIndex().toList()
-
-        val filtered =
-            packageName?.let { patches.filter { (_, patch) -> patch.filterCompatiblePackages(it) } } ?: patches
+        val filtered = packageName?.let {  patches.filter { patch -> patch.anyPackageName(it) } } ?: patches

        if (filtered.isNotEmpty()) logger.info(filtered.joinToString("\n\n") { it.buildString() })
    }
-}
+}
--- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt
@@ -7,37 +7,33 @@ import picocli.CommandLine.Command
 import picocli.CommandLine.IVersionProvider
 import java.util.*

+
 fun main(args: Array<String>) {
    Logger.setDefault()
-    CommandLine(MainCommand).execute(*args).let(System::exit)
+    CommandLine(MainCommand).execute(*args)
 }

 private object CLIVersionProvider : IVersionProvider {
-    override fun getVersion() =
-        arrayOf(
-            MainCommand::class.java.getResourceAsStream(
-                "/app/revanced/cli/version.properties",
-            )?.use { stream ->
-                Properties().apply {
-                    load(stream)
-                }.let {
-                    "ReVanced CLI v${it.getProperty("version")}"
-                }
-            } ?: "ReVanced CLI",
-        )
+    override fun getVersion() = arrayOf(
+        MainCommand::class.java.getResourceAsStream(
+            "/app/revanced/cli/version.properties"
+        )?.use { stream ->
+            Properties().apply { load(stream) }.let {
+                "ReVanced CLI v${it.getProperty("version")}"
+            }
+        } ?: "ReVanced CLI")
 }

@Command(
    name = "revanced-cli",
-    description = ["Command line application to use ReVanced."],
+    description = ["Command line application to use ReVanced"],
    mixinStandardHelpOptions = true,
    versionProvider = CLIVersionProvider::class,
    subcommands = [
+        ListPatchesCommand::class,
        PatchCommand::class,
        OptionsCommand::class,
-        ListPatchesCommand::class,
-        ListCompatibleVersions::class,
        UtilityCommand::class,
-    ],
+    ]
 )
-private object MainCommand
+private object MainCommand
--- a/src/main/kotlin/app/revanced/cli/command/OptionsCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/OptionsCommand.kt
@@ -10,53 +10,45 @@ import java.util.logging.Logger

@CommandLine.Command(
    name = "options",
-    description = ["Generate options file from patches."],
+    description = ["Generate options file from patches"],
 )
 internal object OptionsCommand : Runnable {
    private val logger = Logger.getLogger(OptionsCommand::class.java.name)

    @CommandLine.Parameters(
-        description = ["Paths to patch bundles."],
-        arity = "1..*",
+        description = ["Paths to patch bundles"], arity = "1..*"
    )
    private lateinit var patchBundles: Array<File>

    @CommandLine.Option(
-        names = ["-p", "--path"],
-        description = ["Path to patch options JSON file."],
-        showDefaultValue = ALWAYS,
+        names = ["-p", "--path"], description = ["Path to patch options JSON file"], showDefaultValue = ALWAYS
    )
    private var filePath: File = File("options.json")

    @CommandLine.Option(
-        names = ["-o", "--overwrite"],
-        description = ["Overwrite existing options file."],
-        showDefaultValue = ALWAYS,
+        names = ["-o", "--overwrite"], description = ["Overwrite existing options file"], showDefaultValue = ALWAYS
    )
    private var overwrite: Boolean = false

    @CommandLine.Option(
        names = ["-u", "--update"],
-        description = ["Update existing options by adding missing and removing non-existent options."],
-        showDefaultValue = ALWAYS,
+        description = ["Update existing options by adding missing and removing non-existent options"],
+        showDefaultValue = ALWAYS
    )
    private var update: Boolean = false

-    override fun run() =
-        try {
-            PatchBundleLoader.Jar(*patchBundles).let { patches ->
-                val exists = filePath.exists()
-                if (!exists || overwrite) {
-                    if (exists && update) patches.setOptions(filePath)
+    override fun run() = try {
+        PatchBundleLoader.Jar(*patchBundles).let { patches ->
+            val exists = filePath.exists()
+            if (!exists || overwrite) {
+                if (exists && update) patches.setOptions(filePath)

-                    Options.serialize(patches, prettyPrint = true).let(filePath::writeText)
-                } else {
-                    throw OptionsFileAlreadyExistsException()
-                }
-            }
-        } catch (ex: OptionsFileAlreadyExistsException) {
-            logger.severe("Options file already exists, use --overwrite to override it")
+                Options.serialize(patches, prettyPrint = true).let(filePath::writeText)
+            } else throw OptionsFileAlreadyExistsException()
        }
+    } catch (ex: OptionsFileAlreadyExistsException) {
+        logger.severe("Options file already exists, use --overwrite to override it")
+    }

    class OptionsFileAlreadyExistsException : Exception()
-}
+}
--- a/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
@@ -1,15 +1,13 @@
 package app.revanced.cli.command

 import app.revanced.library.ApkUtils
-import app.revanced.library.ApkUtils.applyTo
-import app.revanced.library.ApkUtils.sign
 import app.revanced.library.Options
 import app.revanced.library.Options.setOptions
 import app.revanced.library.adb.AdbManager
 import app.revanced.patcher.PatchBundleLoader
 import app.revanced.patcher.PatchSet
 import app.revanced.patcher.Patcher
-import app.revanced.patcher.PatcherConfig
+import app.revanced.patcher.PatcherOptions
 import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import picocli.CommandLine.Help.Visibility.ALWAYS
@@ -20,9 +18,9 @@ import java.io.PrintWriter
 import java.io.StringWriter
 import java.util.logging.Logger

+
@CommandLine.Command(
-    name = "patch",
-    description = ["Patch an APK file."],
+    name = "patch", description = ["Patch an APK file"]
 )
 internal object PatchCommand : Runnable {
    private val logger = Logger.getLogger(PatchCommand::class.java.name)
@@ -32,227 +30,155 @@ internal object PatchCommand : Runnable {

    private lateinit var apk: File

-    private var integrations = setOf<File>()
+    private var integrations = listOf<File>()

-    private var patchBundles = emptySet<File>()
+    private var patchBundles = emptyList<File>()

    @CommandLine.Option(
-        names = ["-i", "--include"],
-        description = ["List of patches to include."],
+        names = ["-i", "--include"], description = ["List of patches to include"]
    )
-    private var includedPatches = hashSetOf<String>()
+    private var includedPatches = arrayOf<String>()

    @CommandLine.Option(
-        names = ["--ii"],
-        description = ["List of patches to include by their index in relation to the supplied patch bundles."],
+        names = ["-e", "--exclude"], description = ["List of patches to exclude"]
    )
-    private var includedPatchesByIndex = arrayOf<Int>()
+    private var excludedPatches = arrayOf<String>()

    @CommandLine.Option(
-        names = ["-e", "--exclude"],
-        description = ["List of patches to exclude."],
+        names = ["--options"], description = ["Path to patch options JSON file"], showDefaultValue = ALWAYS
    )
-    private var excludedPatches = hashSetOf<String>()
-
-    @CommandLine.Option(
-        names = ["--ei"],
-        description = ["List of patches to exclude by their index in relation to the supplied patch bundles."],
-    )
-    private var excludedPatchesByIndex = arrayOf<Int>()
-
-    @CommandLine.Option(
-        names = ["--options"],
-        description = ["Path to patch options JSON file."],
-    )
-    private var optionsFile: File? = null
+    private var optionsFile: File = File("options.json")

    @CommandLine.Option(
        names = ["--exclusive"],
-        description = ["Only include patches that are explicitly specified to be included."],
-        showDefaultValue = ALWAYS,
+        description = ["Only include patches that are explicitly specified to be included"],
+        showDefaultValue = ALWAYS
    )
    private var exclusive = false

    @CommandLine.Option(
-        names = ["-f", "--force"],
-        description = ["Bypass compatibility checks for the supplied APK's version."],
-        showDefaultValue = ALWAYS,
+        names = ["-f","--force"],
+        description = ["Bypass compatibility checks for the supplied APK's version"],
+        showDefaultValue = ALWAYS
    )
    private var force: Boolean = false

-    private var outputFilePath: File? = null
-
    @CommandLine.Option(
-        names = ["-o", "--out"],
-        description = ["Path to save the patched APK file to. Defaults to the same directory as the supplied APK file."],
+        names = ["-o", "--out"], description = ["Path to save the patched APK file to"], required = true
    )
-    private fun setOutputFilePath(outputFilePath: File?) {
-        this.outputFilePath = outputFilePath?.absoluteFile
-    }
+    private lateinit var outputFilePath: File

    @CommandLine.Option(
-        names = ["-d", "--device-serial"],
-        description = ["ADB device serial to install to. If not supplied, the first connected device will be used."],
-        // Empty string to indicate that the first connected device should be used.
-        fallbackValue = "",
-        arity = "0..1",
+        names = ["-d", "--device-serial"], description = ["ADB device serial to install to"], showDefaultValue = ALWAYS
    )
    private var deviceSerial: String? = null

    @CommandLine.Option(
-        names = ["--mount"],
-        description = ["Install by mounting the patched APK file."],
-        showDefaultValue = ALWAYS,
+        names = ["--mount"], description = ["Install by mounting the patched APK file"], showDefaultValue = ALWAYS
    )
    private var mount: Boolean = false

    @CommandLine.Option(
-        names = ["--keystore"],
-        description = [
-            "Path to the keystore to sign the patched APK file with. " +
-                "Defaults to the same directory as the supplied APK file.",
-        ],
+        names = ["--keystore"], description = ["Path to the keystore to sign the patched APK file with"],
    )
    private var keystoreFilePath: File? = null

    // key store password
    @CommandLine.Option(
        names = ["--keystore-password"],
-        description = ["The password of the keystore to sign the patched APK file with. Empty password by default."],
+        description = ["The password of the keystore to sign the patched APK file with"],
    )
    private var keyStorePassword: String? = null // Empty password by default

    @CommandLine.Option(
-        names = ["--alias"],
-        description = ["The alias of the key from the keystore to sign the patched APK file with."],
-        showDefaultValue = ALWAYS,
+        names = ["--alias"], description = ["The alias of the key from the keystore to sign the patched APK file with"],
+        showDefaultValue = ALWAYS
    )
    private var alias = "ReVanced Key"

    @CommandLine.Option(
        names = ["--keystore-entry-password"],
-        description = ["The password of the entry from the keystore for the key to sign the patched APK file with."],
+        description = ["The password of the entry from the keystore for the key to sign the patched APK file with"]
    )
    private var password = "" // Empty password by default

    @CommandLine.Option(
-        names = ["--signer"],
-        description = ["The name of the signer to sign the patched APK file with."],
-        showDefaultValue = ALWAYS,
+        names = ["--signer"], description = ["The name of the signer to sign the patched APK file with"],
+        showDefaultValue = ALWAYS
    )
    private var signer = "ReVanced"

    @CommandLine.Option(
        names = ["-r", "--resource-cache"],
-        description = ["Path to temporary resource cache directory."],
+        description = ["Path to temporary resource cache directory"],
+        showDefaultValue = ALWAYS
    )
-    private var resourceCachePath: File? = null
-        set(value) {
-            logger.warning("The --resource-cache option is deprecated. Use --temporary-files-patch instead.")
-            field = value
-            temporaryFilesPath = value
-        }
-
-    @CommandLine.Option(
-        names = ["-t", "--temporary-files-path"],
-        description = ["Path to temporary files directory."],
-    )
-    private var temporaryFilesPath: File? = null
+    private var resourceCachePath = File("revanced-resource-cache")

    private var aaptBinaryPath: File? = null

    @CommandLine.Option(
        names = ["-p", "--purge"],
-        description = ["Purge the temporary resource cache directory after patching."],
-        showDefaultValue = ALWAYS,
+        description = ["Purge the temporary resource cache directory after patching"],
+        showDefaultValue = ALWAYS
    )
    private var purge: Boolean = false

    @CommandLine.Option(
        names = ["-w", "--warn"],
-        description = ["Warn if a patch can not be found in the supplied patch bundles."],
-        showDefaultValue = ALWAYS,
+        description = ["Warn if a patch can not be found in the supplied patch bundles"],
+        showDefaultValue = ALWAYS
    )
    private var warn: Boolean = false

    @CommandLine.Parameters(
-        description = ["APK file to be patched."],
-        arity = "1..1",
+        description = ["APK file to be patched"], arity = "1..1"
    )
    @Suppress("unused")
    private fun setApk(apk: File) {
-        if (!apk.exists()) {
-            throw CommandLine.ParameterException(
-                spec.commandLine(),
-                "APK file ${apk.name} does not exist",
-            )
-        }
+        if (!apk.exists()) throw CommandLine.ParameterException(
+            spec.commandLine(),
+            "APK file ${apk.name} does not exist"
+        )
        this.apk = apk
    }

    @CommandLine.Option(
-        names = ["-m", "--merge"],
-        description = ["One or more DEX files or containers to merge into the APK."],
+        names = ["-m", "--merge"], description = ["One or more DEX files or containers to merge into the APK"]
    )
    @Suppress("unused")
    private fun setIntegrations(integrations: Array<File>) {
        integrations.firstOrNull { !it.exists() }?.let {
-            throw CommandLine.ParameterException(spec.commandLine(), "Integrations file ${it.name} does not exist.")
+            throw CommandLine.ParameterException(spec.commandLine(), "Integrations file ${it.name} does not exist")
        }
        this.integrations += integrations
    }

    @CommandLine.Option(
-        names = ["-b", "--patch-bundle"],
-        description = ["One or more bundles of patches."],
-        required = true,
+        names = ["-b", "--patch-bundle"], description = ["One or more bundles of patches"], required = true
    )
    @Suppress("unused")
-    private fun setPatchBundles(patchBundles: Set<File>) {
+    private fun setPatchBundles(patchBundles: Array<File>) {
        patchBundles.firstOrNull { !it.exists() }?.let {
            throw CommandLine.ParameterException(spec.commandLine(), "Patch bundle ${it.name} does not exist")
        }
-        this.patchBundles = patchBundles
+        this.patchBundles = patchBundles.toList()
    }

    @CommandLine.Option(
-        names = ["--custom-aapt2-binary"],
-        description = ["Path to a custom AAPT binary to compile resources with."],
+        names = ["--custom-aapt2-binary"], description = ["Path to a custom AAPT binary to compile resources with"]
    )
    @Suppress("unused")
    private fun setAaptBinaryPath(aaptBinaryPath: File) {
-        if (!aaptBinaryPath.exists()) {
-            throw CommandLine.ParameterException(
-                spec.commandLine(),
-                "AAPT binary ${aaptBinaryPath.name} does not exist",
-            )
-        }
+        if (!aaptBinaryPath.exists()) throw CommandLine.ParameterException(
+            spec.commandLine(),
+            "AAPT binary ${aaptBinaryPath.name} does not exist"
+        )
        this.aaptBinaryPath = aaptBinaryPath
    }

    override fun run() {
-        // region Setup
-
-        val outputFilePath =
-            outputFilePath ?: File("").absoluteFile.resolve(
-                "${apk.nameWithoutExtension}-patched.${apk.extension}",
-            )
-
-        val temporaryFilesPath =
-            temporaryFilesPath ?: outputFilePath.parentFile.resolve(
-                "${outputFilePath.nameWithoutExtension}-temporary-files",
-            )
-
-        val optionsFile =
-            optionsFile ?: outputFilePath.parentFile.resolve(
-                "${outputFilePath.nameWithoutExtension}-options.json",
-            )
-
-        val keystoreFilePath =
-            keystoreFilePath ?: outputFilePath.parentFile
-                .resolve("${outputFilePath.nameWithoutExtension}.keystore")
-
-        // endregion
+        val adbManager = deviceSerial?.let { serial -> AdbManager.getAdbManager(serial, mount) }

        // region Load patches

@@ -261,43 +187,37 @@ internal object PatchCommand : Runnable {
        val patches = PatchBundleLoader.Jar(*patchBundles.toTypedArray())

        // Warn if a patch can not be found in the supplied patch bundles.
-        if (warn) {
-            patches.map { it.name }.toHashSet().let { availableNames ->
-                (includedPatches + excludedPatches).filter { name ->
-                    !availableNames.contains(name)
-                }
-            }.let { unknownPatches ->
-                if (unknownPatches.isEmpty()) return@let
-                logger.warning("Unknown input of patches:\n${unknownPatches.joinToString("\n")}")
+        if (warn) patches.map { it.name }.toHashSet().let { availableNames ->
+            arrayOf(*includedPatches, *excludedPatches).filter { name ->
+                !availableNames.contains(name)
            }
+        }.let { unknownPatches ->
+            if (unknownPatches.isEmpty()) return@let
+            logger.warning("Unknown input of patches:\n${unknownPatches.joinToString("\n")}")
        }

        // endregion
-        val (packageName, patcherResult) = Patcher(
-            PatcherConfig(
-                apk,
-                temporaryFilesPath,
-                aaptBinaryPath?.path,
-                temporaryFilesPath.absolutePath,
-                true,
-            ),
-        ).use { patcher ->
-            val filteredPatches =
-                patcher.filterPatchSelection(patches).also { patches ->
-                    logger.info("Setting patch options")

-                    if (optionsFile.exists()) {
-                        patches.setOptions(optionsFile)
-                    } else {
-                        Options.serialize(patches, prettyPrint = true).let(optionsFile::writeText)
-                    }
-                }
+        Patcher(
+            PatcherOptions(
+                apk,
+                resourceCachePath,
+                aaptBinaryPath?.path,
+                resourceCachePath.absolutePath,
+            )
+        ).use { patcher ->
+            val filteredPatches = patcher.filterPatchSelection(patches).also { patches ->
+                logger.info("Setting patch options")
+
+                if (optionsFile.exists()) patches.setOptions(optionsFile)
+                else Options.serialize(patches, prettyPrint = true).let(optionsFile::writeText)
+            }

            // region Patch

-            patcher.context.packageMetadata.packageName to patcher.apply {
+            val patcherResult = patcher.apply {
                acceptIntegrations(integrations)
-                acceptPatches(filteredPatches)
+                acceptPatches(filteredPatches.toList())

                // Execute patches.
                runBlocking {
@@ -311,109 +231,101 @@ internal object PatchCommand : Runnable {
                    }
                }
            }.get()
+
            // endregion
-        }

-        // region Save
+            // region Save

-        apk.copyTo(outputFilePath, overwrite = true)
+            val tempFile = resourceCachePath.resolve(apk.name).apply {
+                ApkUtils.copyAligned(apk, this, patcherResult)
+            }

-        patcherResult.applyTo(outputFilePath)
+            val keystoreFilePath = keystoreFilePath ?: outputFilePath.absoluteFile.parentFile
+                .resolve("${outputFilePath.nameWithoutExtension}.keystore")

-        if (!mount) {
-            outputFilePath.sign(
+            if (!mount) ApkUtils.sign(
+                tempFile,
+                outputFilePath,
                ApkUtils.SigningOptions(
                    keystoreFilePath,
                    keyStorePassword,
                    alias,
                    password,
-                    signer,
-                ),
+                    signer
+                )
            )
+
+            // endregion
+
+            // region Install
+
+            adbManager?.install(AdbManager.Apk(outputFilePath, patcher.context.packageMetadata.packageName))
+
+            // endregion
        }

-        logger.info("Saved to $outputFilePath")
-
-        // endregion
-
-        // region Install
-
-        deviceSerial?.let { serial ->
-            AdbManager.getAdbManager(deviceSerial = serial.ifEmpty { null }, mount)
-        }?.install(AdbManager.Apk(outputFilePath, packageName))
-
-        // endregion
-
        if (purge) {
            logger.info("Purging temporary files")
-            purge(temporaryFilesPath)
+            purge(resourceCachePath)
        }
    }

+
    /**
     * Filter the patches to be added to the patcher. The filter is based on the following:
     *
     * @param patches The patches to filter.
     * @return The filtered patches.
     */
-    private fun Patcher.filterPatchSelection(patches: PatchSet): PatchSet =
-        buildSet {
-            val packageName = context.packageMetadata.packageName
-            val packageVersion = context.packageMetadata.packageVersion
+    private fun Patcher.filterPatchSelection(patches: PatchSet): PatchSet = buildSet {
+        val packageName = context.packageMetadata.packageName
+        val packageVersion = context.packageMetadata.packageVersion

-            patches.withIndex().forEach patch@{ (i, patch) ->
-                val patchName = patch.name!!
+        patches.forEach patch@{ patch ->
+            val patchName = patch.name!!

-                val explicitlyExcluded = excludedPatches.contains(patchName) || excludedPatchesByIndex.contains(i)
-                if (explicitlyExcluded) return@patch logger.info("Excluding $patchName")
+            val explicitlyExcluded = excludedPatches.contains(patchName)
+            if (explicitlyExcluded) return@patch logger.info("Excluding $patchName")

-                // Make sure the patch is compatible with the supplied APK files package name and version.
-                patch.compatiblePackages?.let { packages ->
-                    packages.singleOrNull { it.name == packageName }?.let { `package` ->
-                        val matchesVersion =
-                            force || `package`.versions?.let {
-                                it.any { version -> version == packageVersion }
-                            } ?: true
+            // Make sure the patch is compatible with the supplied APK files package name and version.
+            patch.compatiblePackages?.let { packages ->
+                packages.singleOrNull { it.name == packageName }?.let { `package` ->
+                    val matchesVersion = force || `package`.versions?.let {
+                        it.any { version -> version == packageVersion }
+                    } ?: true

-                        if (!matchesVersion) {
-                            return@patch logger.warning(
-                                "$patchName is incompatible with version $packageVersion. " +
-                                    "This patch is only compatible with version " +
-                                    packages.joinToString(";") { pkg ->
-                                        pkg.versions!!.joinToString(", ")
-                                    },
-                            )
+                    if (!matchesVersion) return@patch logger.warning(
+                        "$patchName is incompatible with version $packageVersion. "
+                                + "This patch is only compatible with version "
+                                + packages.joinToString(";") { pkg ->
+                            pkg.versions!!.joinToString(", ")
                        }
-                    } ?: return@patch logger.fine(
-                        "$patchName is incompatible with $packageName. " +
-                            "This patch is only compatible with " +
-                            packages.joinToString(", ") { `package` -> `package`.name },
                    )
+                } ?: return@patch logger.fine(
+                    "$patchName is incompatible with $packageName. "
+                        + "This patch is only compatible with "
+                        + packages.joinToString(", ") { `package` -> `package`.name })

-                    return@let
-                } ?: logger.fine("$patchName has no constraint on packages.")
+                return@let
+            } ?: logger.fine("$patchName has no constraint on packages.")

-                // If the patch is implicitly used, it will be only included if [exclusive] is false.
-                val implicitlyIncluded = !exclusive && patch.use
-                // If the patch is explicitly used, it will be included even if [exclusive] is false.
-                val explicitlyIncluded = includedPatches.contains(patchName) || includedPatchesByIndex.contains(i)
+            // If the patch is implicitly used, it will be only included if [exclusive] is false.
+            val implicitlyIncluded = !exclusive && patch.use
+            // If the patch is explicitly used, it will be included even if [exclusive] is false.
+            val explicitlyIncluded = includedPatches.contains(patchName)

-                val included = implicitlyIncluded || explicitlyIncluded
-                if (!included) return@patch logger.info("$patchName excluded") // Case 1.
+            val included = implicitlyIncluded || explicitlyIncluded
+            if (!included) return@patch logger.info("$patchName excluded") // Case 1.

-                logger.fine("Adding $patchName")
+            logger.fine("Adding $patchName")

-                add(patch)
-            }
+            add(patch)
        }
+    }

    private fun purge(resourceCachePath: File) {
-        val result =
-            if (resourceCachePath.deleteRecursively()) {
-                "Purged resource cache directory"
-            } else {
-                "Failed to purge resource cache directory"
-            }
+        val result = if (resourceCachePath.deleteRecursively()) "Purged resource cache directory"
+        else "Failed to purge resource cache directory"
        logger.info(result)
    }
-}
+}
--- a/src/main/kotlin/app/revanced/cli/command/utility/InstallCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/utility/InstallCommand.kt
@@ -5,23 +5,20 @@ import picocli.CommandLine.*
 import java.io.File
 import java.util.logging.Logger

+
@Command(
-    name = "install",
-    description = ["Install an APK file to devices with the supplied ADB device serials"],
+    name = "install", description = ["Install an APK file to devices with the supplied ADB device serials"]
 )
 internal object InstallCommand : Runnable {
    private val logger = Logger.getLogger(InstallCommand::class.java.name)

    @Parameters(
-        description = ["ADB device serials. If not supplied, the first connected device will be used."],
-        arity = "0..*",
+        description = ["ADB device serials"], arity = "1..*"
    )
-    private var deviceSerials: Array<String>? = null
+    private lateinit var deviceSerials: Array<String>

    @Option(
-        names = ["-a", "--apk"],
-        description = ["APK file to be installed"],
-        required = true,
+        names = ["-a", "--apk"], description = ["APK file to be installed"], required = true
    )
    private lateinit var apk: File

@@ -31,14 +28,11 @@ internal object InstallCommand : Runnable {
    )
    private var packageName: String? = null

-    override fun run() {
-        fun install(deviceSerial: String? = null) =
-            try {
-                AdbManager.getAdbManager(deviceSerial, packageName != null).install(AdbManager.Apk(apk, packageName))
-            } catch (e: AdbManager.DeviceNotFoundException) {
-                logger.severe(e.toString())
-            }
-
-        deviceSerials?.forEach(::install) ?: install()
+    override fun run() = deviceSerials.forEach { deviceSerial ->
+        try {
+            AdbManager.getAdbManager(deviceSerial, packageName != null).install(AdbManager.Apk(apk, packageName))
+        } catch (e: AdbManager.DeviceNotFoundException) {
+            logger.severe(e.toString())
+        }
    }
-}
+}
--- a/src/main/kotlin/app/revanced/cli/command/utility/UninstallCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/utility/UninstallCommand.kt
@@ -5,41 +5,32 @@ import picocli.CommandLine.*
 import picocli.CommandLine.Help.Visibility.ALWAYS
 import java.util.logging.Logger

+
@Command(
    name = "uninstall",
-    description = ["Uninstall a patched app from the devices with the supplied ADB device serials"],
+    description = ["Uninstall a patched app from the devices with the supplied ADB device serials"]
 )
 internal object UninstallCommand : Runnable {
    private val logger = Logger.getLogger(UninstallCommand::class.java.name)

-    @Parameters(
-        description = ["ADB device serials. If not supplied, the first connected device will be used."],
-        arity = "0..*",
-    )
-    private var deviceSerials: Array<String>? = null
+    @Parameters(description = ["ADB device serials"], arity = "1..*")
+    private lateinit var deviceSerials: Array<String>

-    @Option(
-        names = ["-p", "--package-name"],
-        description = ["Package name of the app to uninstall"],
-        required = true,
-    )
+    @Option(names = ["-p", "--package-name"], description = ["Package name of the app to uninstall"], required = true)
    private lateinit var packageName: String

    @Option(
        names = ["-u", "--unmount"],
        description = ["Uninstall by unmounting the patched APK file"],
-        showDefaultValue = ALWAYS,
+        showDefaultValue = ALWAYS
    )
    private var unmount: Boolean = false

-    override fun run() {
-        fun uninstall(deviceSerial: String? = null) =
-            try {
-                AdbManager.getAdbManager(deviceSerial, unmount).uninstall(packageName)
-            } catch (e: AdbManager.DeviceNotFoundException) {
-                logger.severe(e.toString())
-            }
-
-        deviceSerials?.forEach { uninstall(it) } ?: uninstall()
+    override fun run() = deviceSerials.forEach { deviceSerial ->
+        try {
+            AdbManager.getAdbManager(deviceSerial, unmount).uninstall(packageName)
+        } catch (e: AdbManager.DeviceNotFoundException) {
+            logger.severe(e.toString())
+        }
    }
-}
+}
--- a/src/main/kotlin/app/revanced/cli/command/utility/UtilityCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/utility/UtilityCommand.kt
@@ -4,7 +4,7 @@ import picocli.CommandLine

@CommandLine.Command(
    name = "utility",
-    description = ["Commands for utility purposes."],
+    description = ["Commands for utility purposes"],
    subcommands = [InstallCommand::class, UninstallCommand::class],
 )
-internal object UtilityCommand
+internal object UtilityCommand
Author	SHA1	Message	Date
semantic-release-bot	fd8b00702d	chore(release): 4.0.1-dev.1 [skip ci] ## [4.0.1-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.0.0...v4.0.1-dev.1) (2023-10-07) ### Bug Fixes * Correct warning message ([`e4e339d`](`e4e339dff4`))	2023-10-07 00:10:10 +00:00
oSumAtrIX	e4e339dff4	fix: Correct warning message	2023-10-07 01:56:13 +02:00
oSumAtrIX	0c70b589b6	build(Needs bump): Bump dependencies	2023-10-07 01:56:12 +02:00
oSumAtrIX	ca07dbc0e7	docs: Fix incorrect bullet point	2023-10-07 01:14:12 +02:00