Skip to content

Commit 63e8585

Browse files
authoredDec 28, 2023
chore: Merge branch dev to main (#305)
2 parents 09bc652 + 8f59d94 commit 63e8585

File tree

9 files changed

+56
-13
lines changed

9 files changed

+56
-13
lines changed
 

‎CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [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)
2+
3+
4+
### Bug Fixes
5+
6+
* Add missing punctuation in command description ([8210351](https://github.com/ReVanced/revanced-cli/commit/821035107d7264580275f395e9e3fcef91394afd))
7+
8+
# [4.4.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.3.0...v4.4.0-dev.1) (2023-12-01)
9+
10+
11+
### Features
12+
13+
* Log saved patched APK file path ([16109bd](https://github.com/ReVanced/revanced-cli/commit/16109bd8bc6236debf71cbc8db78fe452b2ed00d))
14+
115
# [4.3.0](https://github.com/ReVanced/revanced-cli/compare/v4.2.0...v4.3.0) (2023-12-01)
216

317

‎docs/0_prerequisites.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ To use ReVanced CLI, you will need to fulfill specific requirements.
44

55
## 🤝 Requirements
66

7-
- Java SDK 11 (Azul Zulu JDK or OpenJDK)
8-
- [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb) if you want to install the patched APK file on your device
7+
- Java Runtime Environment 11 (Azul Zulu JRE or OpenJDK)
8+
- [Android Debug Bridge (ADB)](https://developer.android.com/studio/command-line/adb) if you want to install the patched APK file on your device
99
- An ABI other than ARMv7 such as x86 or x86-64 (or a custom AAPT binary that supports ARMv7)
1010

1111
## ⏭️ Whats next

‎docs/1_usage.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ReVanced CLI is divided into the following fundamental commands:
3535
```
3636

3737
> [!NOTE]
38-
> A default `options.json` file will be automatically created, if it does not exist
38+
> A default `options.json` file will be automatically created if it does not exist
3939
without any need for intervention when using the `patch` command.
4040

4141
- ### 💉 Patch an app
@@ -80,7 +80,7 @@ without any need for intervention when using the `patch` command.
8080
- #### 👾 Patch an app and mount it on top of the un-patched app with root permissions
8181
8282
> [!IMPORTANT]
83-
> Ensure sure the same app you are patching and mounting over is installed on your device:
83+
> Ensure that the same app you are patching and mounting over is installed on your device:
8484
>
8585
> ```bash
8686
> adb install app.apk
@@ -91,14 +91,14 @@ without any need for intervention when using the `patch` command.
9191
> patches by their index in relation to supplied patch bundles,
9292
> similarly to the option `--include` and `--exclude`.
9393
>
94-
> This is useful in case two patches have the same name, and you need to include or exclude one of them.
95-
> The index of a patch is calculated by the position of the patch in the list of patches
94+
> This is useful in case two patches have the same name, and you must include or exclude one.
95+
> The patch index is calculated by the position of the patch in the list of patches
9696
> from patch bundles supplied using the option `--patch-bundle`.
9797
>
9898
> You can list all patches with their indices using the command `list-patches`.
9999
>
100-
> Keep in mind, that the indices can change based on the order of the patch bundles supplied,
101-
> as well if the patch bundles are updated, because patches can be added or removed.
100+
> Keep in mind that the indices can change based on the order of the patch bundles supplied,
101+
> as well if the patch bundles are updated because patches can be added or removed.
102102
103103
```bash
104104
java -jar revanced-cli.jar patch \
@@ -133,4 +133,4 @@ by adding the option `--unmount`.
133133
134134
> [!NOTE]
135135
> You can mount an APK file
136-
> by supplying the package name of the app to mount the supplied APK file to over the option `--mount`.
136+
> by supplying the package name of the app to mount the supplied APK file over the option `--mount`.

‎docs/2_building.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# 🔨️ Building
2+
3+
Build ReVanced CLI from source.
4+
5+
## 📝 Requirements
6+
7+
- Java Development Kit 11 (Azul Zulu JRE or OpenJDK)
8+
9+
## 🏗️ Building
10+
11+
To build ReVanced CLI, follow these steps:
12+
13+
1. Clone the repository:
14+
15+
```bash
16+
git clone git@github.com:ReVanced/revanced-cli.git
17+
cd revanced-cli
18+
```
19+
20+
2. Build the project:
21+
22+
```bash
23+
./gradlew build
24+
```
25+
26+
After the build succeeds, the built JAR file will be located at `build/libs/revanced-cli-<version>-all.jar`.

‎docs/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# 💻 Documentation and guides of ReVanced CLI
22

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

55
## 📖 Table of contents
66

77
1. [💼 Prerequisites](0_prerequisites.md)
88
2. [🛠️ Using ReVanced CLI](1_usage.md)
9+
3. [🔨 Building ReVanced CLI](2_building.md)

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
org.gradle.parallel = true
22
org.gradle.caching = true
33
kotlin.code.style = official
4-
version = 4.3.0
4+
version = 4.4.0-dev.2

‎settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ rootProject.name = "revanced-cli"
22

33
buildCache {
44
local {
5-
isEnabled = !System.getenv().containsKey("CI")
5+
isEnabled = "CI" !in System.getenv()
66
}
77
}

‎src/main/kotlin/app/revanced/cli/command/PatchCommand.kt

+2
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ internal object PatchCommand : Runnable {
325325
alignedFile.renameTo(outputFilePath)
326326
}
327327

328+
logger.info("Saved to $outputFilePath")
329+
328330
// endregion
329331

330332
// region Install

‎src/main/kotlin/app/revanced/cli/command/utility/UtilityCommand.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import picocli.CommandLine
44

55
@CommandLine.Command(
66
name = "utility",
7-
description = ["Commands for utility purposes"],
7+
description = ["Commands for utility purposes."],
88
subcommands = [InstallCommand::class, UninstallCommand::class],
99
)
1010
internal object UtilityCommand

0 commit comments

Comments
 (0)