chore(release): 2.21.4 [skip ci]

## [2.21.4](https://github.com/revanced/revanced-cli/compare/v2.21.3...v2.21.4) (2023-06-21)

### Bug Fixes

* remove duplicate options entries. ([d0fc886](d0fc886428))

.github/workflows/release.yml

@@ -23,17 +23,20 @@ jobs:
           # https://github.com/cycjimmy/semantic-release-action#private-packages
           persist-credentials: false
           fetch-depth: 0
-      - name: Setup JDK
+      - name: Cache
-        uses: actions/setup-java@v3
+        uses: actions/cache@v3
         with:
-          java-version: '17'
+          path: |
-          distribution: 'zulu'
+            ${{ runner.home }}/.gradle/caches
-          cache: gradle
+            ${{ runner.home }}/.gradle/wrapper
-      - name: Setup Node.js
+            .gradle
-        uses: actions/setup-node@v3
+            build
-        with:
+            node_modules
-          node-version: "18"
+          key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
-          cache: 'npm'
+      - name: Build with Gradle
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew clean --no-daemon
       - name: Setup semantic-release
         run: npm install
       - name: Release

.releaserc

@@ -7,7 +7,13 @@
     }
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
+    [
+      "@semantic-release/commit-analyzer", {
+        "releaseRules": [
+          { "type": "build", "scope": "revanced-patcher", "release": "patch" }
+        ]
+      }
+    ],
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",

CHANGELOG.md

@@ -1,3 +1,31 @@
+## [2.21.4](https://github.com/revanced/revanced-cli/compare/v2.21.3...v2.21.4) (2023-06-21)
+
+
+### Bug Fixes
+
+* remove duplicate options entries. ([d0fc886](https://github.com/revanced/revanced-cli/commit/d0fc8864286adc2677f91a319a11a90272c1001d))
+
+## [2.21.4-dev.1](https://github.com/revanced/revanced-cli/compare/v2.21.3...v2.21.4-dev.1) (2023-06-18)
+
+
+### Bug Fixes
+
+* remove duplicate options entries. ([d0fc886](https://github.com/revanced/revanced-cli/commit/d0fc8864286adc2677f91a319a11a90272c1001d))
+
+## [2.21.3](https://github.com/revanced/revanced-cli/compare/v2.21.2...v2.21.3) (2023-06-12)
+
+## [2.21.3-dev.1](https://github.com/revanced/revanced-cli/compare/v2.21.2...v2.21.3-dev.1) (2023-06-07)
+
+## [2.21.2](https://github.com/revanced/revanced-cli/compare/v2.21.1...v2.21.2) (2023-05-24)
+
+## [2.21.2-dev.2](https://github.com/revanced/revanced-cli/compare/v2.21.2-dev.1...v2.21.2-dev.2) (2023-05-15)
+
+## [2.21.2-dev.1](https://github.com/revanced/revanced-cli/compare/v2.21.1...v2.21.2-dev.1) (2023-05-07)
+
+## [2.21.1](https://github.com/revanced/revanced-cli/compare/v2.21.0...v2.21.1) (2023-05-06)
+
+## [2.21.1-dev.1](https://github.com/revanced/revanced-cli/compare/v2.21.0...v2.21.1-dev.1) (2023-05-06)
+
 # [2.21.0](https://github.com/revanced/revanced-cli/compare/v2.20.2...v2.21.0) (2023-05-04)
 
 

build.gradle.kts

@@ -25,7 +25,7 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC")
 
-    implementation("app.revanced:revanced-patcher:7.0.0")
+    implementation("app.revanced:revanced-patcher:11.0.0")
     implementation("info.picocli:picocli:4.7.1")
     implementation("com.github.revanced:jadb:2531a28109") // updated fork
     implementation("com.android.tools.build:apksig:8.1.0-alpha09")
@@ -34,6 +34,10 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test:1.8.20-RC")
 }
 
+kotlin {
+    jvmToolchain(11)
+}
+
 tasks {
     test {
         useJUnitPlatform()

docs/0_prerequisites.md

@@ -1,17 +1,15 @@
 # 💼 Prerequisites
 
-To use the ReVanced CLI, you will need to fulfill certain requirements.
+To use ReVanced CLI, you will need to fulfill certain requirements.
 
 ## 🤝 Requirements
 
-- [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb), the command-line tool that lets
+- [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb) if you want to deploy the patched APK file on your device
-  you communicate with a device (optional).
+- An ABI other than ARMv7 such as x86 or x86-64 (or a custom AAPT binary that supports ARMv7)
-- A x86/x86_64 host (or a custom AAPT binary for your architecture)
+- Java SDK 17 or higher (Azul JDK or OpenJDK)
-- Zulu OpenJDK 17
-- An APK file (e.g. YouTube v17.49.37 or YouTube Music v5.36.51)
 
 ## ⏭️ Whats next
 
-The next section will show, how to use the [ReVanced CLI](https://github.com/revanced/revanced-cli).
+The next section will show, how to use [ReVanced CLI](https://github.com/revanced/revanced-cli).
 
-Continue: [🛠️ Using the ReVanced CLI](1_usage.md)
+Continue: [🛠️ Using ReVanced CLI](1_usage.md)

docs/1_usage.md

@@ -1,6 +1,6 @@
-# 🛠️ Using the ReVanced CLI
+# 🛠️ Using ReVanced CLI
 
-Learn how to use the ReVanced CLI.
+Learn how to ReVanced CLI.
 
 ## ⚡ Setup (optional)
 
@@ -24,7 +24,7 @@ Learn how to use the ReVanced CLI.
 
 ## 🔨 ReVanced CLI Usage
 
-- ### Show all available options for the ReVanced CLI
+- ### Show all available options for ReVanced CLI
 
   ```bash
   java -jar revanced-cli.jar -h
@@ -38,7 +38,7 @@ Learn how to use the ReVanced CLI.
       -l
   ```
 
-- ### Use the ReVanced CLI without root permissions
+- ### Use ReVanced CLI without root permissions
 
   ```bash
   java -jar revanced-cli.jar \

docs/README.md

@@ -1,8 +1,8 @@
 # 💻 Documentation and guides of ReVanced CLI
 
-This documentation explains how to use the [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 the ReVanced CLI](1_usage.md)
+2. [🛠️ Using ReVanced CLI](1_usage.md)

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.21.0
+version = 2.21.4

src/main/kotlin/app/revanced/utils/Options.kt

@@ -5,6 +5,7 @@ import app.revanced.cli.logging.CliLogger
 import app.revanced.patcher.extensions.PatchExtensions.options
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.patch.NoSuchOptionException
+import app.revanced.utils.Options.PatchOption.Option
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import java.io.File
 
@@ -25,9 +26,12 @@ internal object Options {
         .map { patch ->
             PatchOption(
                 patch.patchName,
-                patch.options!!.map { option -> PatchOption.Option(option.key, option.value) }
+                patch.options!!.map { option -> Option(option.key, option.value) }
             )
-        }.let {
+        }
+        // See https://github.com/revanced/revanced-patches/pull/2434/commits/60e550550b7641705e81aa72acfc4faaebb225e7.
+        .distinctBy { it.patchName }
+        .let {
             if (prettyPrint)
                 mapper.writerWithDefaultPrettyPrinter().writeValueAsString(it)
             else