From c04742545a9675bfc73fba7b27afd4251a75183d Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Mon, 22 Jul 2024 22:01:00 +0200
Subject: [PATCH] chore: Remove integrations option

Handled automatically by ReVanced Patcher now.
---
 docs/1_usage.md                               |  7 +----
 gradle/libs.versions.toml                     | 10 +++----
 .../app/revanced/cli/command/PatchCommand.kt  | 26 +------------------
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/docs/1_usage.md b/docs/1_usage.md
index dfb76793..628fdd50 100644
--- a/docs/1_usage.md
+++ b/docs/1_usage.md
@@ -55,12 +55,7 @@ ReVanced CLI is divided into the following fundamental commands:
   > ```bash
   > adb shell su -c exit
   > ```
-
-  > **⚠️ 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.
-
+  > 
   - #### 👾 Patch an app and install it on your device regularly
 
     ```bash
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d61b0ddf..84eafa9e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
 shadow = "8.1.1"
 kotlin = "2.0.0"
-kotlinx-coroutines-core = "1.8.0"
-picocli = "4.7.5"
-revanced-patcher = "19.3.1"
-revanced-library = "2.3.0"
+kotlinx-coroutines-core = "1.8.1"
+picocli = "4.7.6"
+revanced-patcher = "20.0.0-dev.1"
+revanced-library = "2.4.0-dev.1"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 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" }
-revanced-library = { module = "app.revanced:revanced-library", version.ref = "revanced-library" }
+revanced-library = { module = "app.revanced:revanced-library-jvm", version.ref = "revanced-library" }
 
 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
diff --git a/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt b/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
index f8fd0128..8d2d440f 100644
--- a/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
@@ -31,8 +31,6 @@ internal object PatchCommand : Runnable {
 
     private lateinit var apk: File
 
-    private var integrations = emptySet<File>()
-
     private var patchBundles = emptySet<File>()
 
     @CommandLine.Option(
@@ -121,16 +119,6 @@ internal object PatchCommand : Runnable {
     )
     private var keyStorePassword: String? = null // Empty password by default
 
-    @CommandLine.Option(
-        names = ["--alias"],
-        description = ["The alias of the keystore entry to sign the patched APK file with."],
-        showDefaultValue = ALWAYS,
-    )
-    private fun setKeyStoreEntryAlias(alias: String = "ReVanced Key") {
-        logger.warning("The --alias option is deprecated. Use --keystore-entry-alias instead.")
-        keyStoreEntryAlias = alias
-    }
-
     @CommandLine.Option(
         names = ["--keystore-entry-alias"],
         description = ["The alias of the keystore entry to sign the patched APK file with."],
@@ -188,18 +176,6 @@ internal object PatchCommand : Runnable {
         this.apk = apk
     }
 
-    @CommandLine.Option(
-        names = ["-m", "--merge"],
-        description = ["One or more DEX files or containers to merge into the APK."],
-    )
-    @Suppress("unused")
-    private fun setIntegrations(integrations: Set<File>) {
-        integrations.firstOrNull { !it.exists() }?.let {
-            throw CommandLine.ParameterException(spec.commandLine(), "Integrations file ${it.path} does not exist.")
-        }
-        this.integrations += integrations
-    }
-
     @CommandLine.Option(
         names = ["-b", "--patch-bundle"],
         description = ["One or more bundles of patches."],
@@ -293,7 +269,7 @@ internal object PatchCommand : Runnable {
                     }
                 }
 
-            patcher += filteredPatches to integrations
+            patcher += filteredPatches
 
             // Execute patches.
             runBlocking {