Skip to content

Commit

Permalink
remove integrations
Browse files Browse the repository at this point in the history
  • Loading branch information
oSumAtrIX committed Jul 26, 2024
1 parent 1b464e6 commit 979a819
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,5 @@ node_modules/
revanced-cache/
options.toml

# Generated by an Android project (such as ReVanced Integrations)
# Generated by Android projects
local.properties
5 changes: 0 additions & 5 deletions docs/1_usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ ReVanced CLI is divided into the following fundamental commands:
> 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
Expand Down
9 changes: 2 additions & 7 deletions src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -194,10 +192,7 @@ internal object PatchCommand : Runnable {
)
@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
logger.warning("The --merge option is not used anymore.")
}

@CommandLine.Option(
Expand Down Expand Up @@ -293,7 +288,7 @@ internal object PatchCommand : Runnable {
}
}

patcher += filteredPatches to integrations
patcher += filteredPatches

// Execute patches.
runBlocking {
Expand Down

0 comments on commit 979a819

Please sign in to comment.