diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml index aa0ed1b..77097e2 100644 --- a/.github/workflows/update-documentation.yml +++ b/.github/workflows/update-documentation.yml @@ -9,6 +9,7 @@ jobs: trigger: runs-on: ubuntu-latest name: Dispatch event to documentation repository + if: github.ref == 'refs/heads/main' steps: - uses: peter-evans/repository-dispatch@v2 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9865bb3..c984d6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.20.2-dev.1](https://github.com/revanced/revanced-cli/compare/v2.20.1...v2.20.2-dev.1) (2023-04-03) + + +### Bug Fixes + +* correct spelling mistake ([31fb316](https://github.com/revanced/revanced-cli/commit/31fb3166d922ae1f568f52e44cbe726dd1c891a4)) + ## [2.20.1](https://github.com/revanced/revanced-cli/compare/v2.20.0...v2.20.1) (2023-03-14) diff --git a/build.gradle.kts b/build.gradle.kts index b63324d..2e11b8d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.8.10" id("com.github.johnrengelman.shadow") version "7.1.2" } @@ -23,10 +23,10 @@ repositories { } dependencies { - implementation(kotlin("reflect")) + implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.10") implementation("app.revanced:revanced-patcher:7.0.0") - implementation("info.picocli:picocli:4.7.0") + implementation("info.picocli:picocli:4.7.1") implementation("com.github.revanced:jadb:master-SNAPSHOT") // updated fork implementation("com.android.tools.build:apksig:7.2.2") implementation("org.bouncycastle:bcpkix-jdk15on:1.70") diff --git a/docs/1_usage.md b/docs/1_usage.md index 13c975f..9b22378 100644 --- a/docs/1_usage.md +++ b/docs/1_usage.md @@ -1,6 +1,6 @@ # 🛠️ Using the ReVanced CLI -Lean how to use the ReVanced CLI. +Learn how to use the ReVanced CLI. ## ⚡ Setup (optional) @@ -43,7 +43,6 @@ Lean how to use the ReVanced CLI. ```bash java -jar revanced-cli.jar \ -a input.apk \ - -c \ -o patched-output.apk \ -b revanced-patches.jar ``` @@ -54,19 +53,18 @@ Lean how to use the ReVanced CLI. adb install input.apk # make sure the same version is installed java -jar revanced-cli.jar \ -a input.apk \ - -c \ -d device-name \ -o patched-output.apk \ -b revanced-patches.jar \ - -e microg-support \ + -e vanced-microg-support \ --mount ``` > **Note**: > > - If you want to exclude patches, you can use the option `-e`. In the case of YouTube, you can exclude - the `microg-support` patch from [ReVanced Patches](https://github.com/revanced/revanced-patches) with the - option `-e microg-support` when mounting for example. + the `vanced-microg-support` patch from [ReVanced Patches](https://github.com/revanced/revanced-patches) with the + option `-e vanced-microg-support` when mounting for example. > > - Some patches from [ReVanced Patches](https://github.com/revanced/revanced-patches) also might require [ReVanced Integrations](https://github.com/revanced/revanced-integrations). Supply them with the option `-m`. diff --git a/gradle.properties b/gradle.properties index 891a094..7b50942 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style = official -version = 2.20.1 +version = 2.20.2-dev.1 diff --git a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt index 0778279..73674ef 100644 --- a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt +++ b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt @@ -37,7 +37,7 @@ fun Patcher.addPatchesFiltered(allPatches: List>>) { val compatibleWith = compatiblePackages.joinToString(";") { _package -> "${_package.name}: ${_package.versions.joinToString(", ")}" } - logger.warn("$prefix: Incompatible with version $packageVersion. This patch is only compatible with version $compatibleWith") + logger.warn("$prefix: Incompatible with version $packageVersion. This patch is only compatible with $compatibleWith") return@patchLoop } }