Skip to content

Commit 5d8beae

Browse files
authored
chore: Merge branch dev to main (#328)
2 parents 1496e82 + dbbc007 commit 5d8beae

28 files changed

+2740
-1690
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ body:
7070
7171
Before creating a new bug report, please keep the following in mind:
7272
73-
- **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-cli/labels/Bug%20report).
73+
- **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-cli/issues?q=label%3A%22Bug+report%22).
7474
- **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-cli/blob/main/CONTRIBUTING.md).
7575
- **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
7676
- type: textarea
@@ -102,7 +102,7 @@ body:
102102
label: Acknowledgements
103103
description: Your bug report will be closed if you don't follow the checklist below.
104104
options:
105-
- label: This issue is not a duplicate of an existing bug report.
105+
- label: I have checked all open and closed bug reports and this is not a duplicate.
106106
required: true
107107
- label: I have chosen an appropriate title.
108108
required: true

.github/ISSUE_TEMPLATE/feature_request.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ body:
7070
7171
Before creating a new feature request, please keep the following in mind:
7272
73-
- **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-cli//labels/Feature%20request).
74-
- **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-cli//blob/main/CONTRIBUTING.md).
73+
- **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-cli/issues?q=label%3A%22Feature+request%22).
74+
- **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-cli//blob/main/CONTRIBUTING.md).
7575
- **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
7676
- type: textarea
7777
attributes:
@@ -98,7 +98,7 @@ body:
9898
label: Acknowledgements
9999
description: Your feature request will be closed if you don't follow the checklist below.
100100
options:
101-
- label: This issue is not a duplicate of an existing feature request.
101+
- label: I have checked all open and closed feature requests and this is not a duplicate.
102102
required: true
103103
- label: I have chosen an appropriate title.
104104
required: true

.github/workflows/release.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
jobs:
1111
release:
1212
name: Release
13+
permissions:
14+
contents: write
1315
runs-on: ubuntu-latest
1416
steps:
1517
- name: Checkout
@@ -42,9 +44,9 @@ jobs:
4244
with:
4345
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
4446
passphrase: ${{ secrets.GPG_PASSPHRASE }}
45-
fingerprint: ${{ env.GPG_FINGERPRINT }}
47+
fingerprint: ${{ vars.GPG_FINGERPRINT }}
4648

4749
- name: Release
4850
env:
49-
GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5052
run: npm exec semantic-release

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,5 @@ node_modules/
121121
revanced-cache/
122122
options.toml
123123

124-
# Generated by an Android project (such as ReVanced Integrations)
124+
# Generated by Android projects
125125
local.properties

.releaserc

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"assets": [
2424
"CHANGELOG.md",
2525
"gradle.properties"
26-
]
26+
],
27+
"message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
2728
}
2829
],
2930
[

CHANGELOG.md

+83
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,86 @@
1+
# [5.0.0-dev.11](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.10...v5.0.0-dev.11) (2024-11-10)
2+
3+
4+
### Bug Fixes
5+
6+
* List if patch option is required ([#346](https://github.com/ReVanced/revanced-cli/issues/346)) ([98ff0c3](https://github.com/ReVanced/revanced-cli/commit/98ff0c34fa71c3b3ecd96157d45a30ee2b8979c6))
7+
8+
# [5.0.0-dev.10](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.9...v5.0.0-dev.10) (2024-11-05)
9+
10+
11+
### Bug Fixes
12+
13+
* Make CLI ArgGroup non-exclusive to be able to disable and enable patches at the same time ([1bb0d13](https://github.com/ReVanced/revanced-cli/commit/1bb0d13726fd5790c59cb6d28df3618c7606710d))
14+
15+
# [5.0.0-dev.9](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.8...v5.0.0-dev.9) (2024-11-05)
16+
17+
18+
### Bug Fixes
19+
20+
* Print in new line correctly ([c2dc9d7](https://github.com/ReVanced/revanced-cli/commit/c2dc9d76be33c98284741e23c406500483c47753))
21+
22+
# [5.0.0-dev.8](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.7...v5.0.0-dev.8) (2024-10-17)
23+
24+
# [5.0.0-dev.7](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.6...v5.0.0-dev.7) (2024-10-16)
25+
26+
27+
### Bug Fixes
28+
29+
* Check for null when no device serial was specified ([1da8ae9](https://github.com/ReVanced/revanced-cli/commit/1da8ae9e46000dd3c4eecd793c559e75012cf535))
30+
31+
# [5.0.0-dev.6](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.5...v5.0.0-dev.6) (2024-10-10)
32+
33+
34+
### Bug Fixes
35+
36+
* Use the first connected device when no ADB device is specified ([5f952f3](https://github.com/ReVanced/revanced-cli/commit/5f952f35f5cb388b6509b2b4d905b8143ebc7996))
37+
38+
# [5.0.0-dev.5](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.4...v5.0.0-dev.5) (2024-09-30)
39+
40+
# [5.0.0-dev.4](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.3...v5.0.0-dev.4) (2024-09-17)
41+
42+
43+
### Bug Fixes
44+
45+
* Make patches selectable by using a mutable collection for the selection option ([751fa1d](https://github.com/ReVanced/revanced-cli/commit/751fa1d889f40c51b291116029fd84f2b051f2f0))
46+
* Make the patch command work without specifying any selection ([ba159a3](https://github.com/ReVanced/revanced-cli/commit/ba159a35a9a99d18a4c1e04128b08ae336a49b3e))
47+
48+
49+
### Features
50+
51+
* Show error about no installation device found at the beginning ([3300e6b](https://github.com/ReVanced/revanced-cli/commit/3300e6b4333ed1c4e6785cb82eca9016fc6d4a20))
52+
53+
# [5.0.0-dev.3](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.2...v5.0.0-dev.3) (2024-08-14)
54+
55+
56+
### Features
57+
58+
* Simplify option descriptions ([45c998b](https://github.com/ReVanced/revanced-cli/commit/45c998b335b65ac233fece8b804dc7410142691c))
59+
60+
# [5.0.0-dev.2](https://github.com/ReVanced/revanced-cli/compare/v5.0.0-dev.1...v5.0.0-dev.2) (2024-08-14)
61+
62+
63+
### Features
64+
65+
* Simplify command and option names and descriptions ([#338](https://github.com/ReVanced/revanced-cli/issues/338)) ([6e7797a](https://github.com/ReVanced/revanced-cli/commit/6e7797a3f0525a8f48af7182157da0d045600ac2))
66+
67+
68+
### BREAKING CHANGES
69+
70+
* Options have been renamed.
71+
72+
# [5.0.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v4.6.0...v5.0.0-dev.1) (2024-08-12)
73+
74+
75+
### Features
76+
77+
* Set patch options via CLI ([#336](https://github.com/ReVanced/revanced-cli/issues/336)) ([2300243](https://github.com/ReVanced/revanced-cli/commit/23002434b2d51c2a3b30b33dd0526261432d90ce))
78+
79+
80+
### BREAKING CHANGES
81+
82+
* This commit changes various CLI options and removes the `options.json` file. Instead, patch options can now be passed via CLI options
83+
184
# [4.6.0](https://github.com/ReVanced/revanced-cli/compare/v4.5.0...v4.6.0) (2024-04-01)
285

386

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,19 @@
6363
![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-cli/release.yml)
6464
![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)
6565

66-
Command line application to use ReVanced.
66+
Command-line application to use ReVanced.
6767

6868
## ❓ About
6969

70-
ReVanced CLI is a command line application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.
70+
ReVanced CLI is a command-line application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.
7171

7272
## 💪 Features
7373

7474
Some of the features ReVanced CLI provides are:
7575

7676
- 💉 **Patch apps**: Harness ReVanced Patcher to patch Android apps
7777
- 💾 **Install and uninstall apps**: Install and uninstall Apps via ADB,
78-
using the Android package manager, or by mounting using root permissions
78+
using the Android package manager or by mounting using root permissions
7979
- 📃 **List patches from patch bundles**: List available patches, compatible packages, and versions
8080
- 💪 **Flexibility and functionality**: Apply any combination of patches to any version of Android apps
8181

build.gradle.kts

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ application {
1616

1717
repositories {
1818
mavenCentral()
19-
mavenLocal()
2019
google()
2120
maven {
22-
// A repository must be speficied for some reason. "registry" is a dummy.
21+
// A repository must be specified for some reason. "registry" is a dummy.
2322
url = uri("https://maven.pkg.github.com/revanced/registry")
2423
credentials {
2524
username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")

docs/0_prerequisites.md

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

55
## 🤝 Requirements
66

7-
- Java Runtime Environment 11 ([Azul Zulu JRE](https://www.azul.com/downloads/?version=java-11-lts&package=jdk#zulu) or [OpenJDK](https://jdk.java.net/archive/))
7+
- Java Runtime Environment 11 ([Azul Zulu JRE](https://www.azul.com/downloads/?version=java-11-lts&package=jre#zulu) or [OpenJDK](https://jdk.java.net/archive/))
88
- [Android Debug Bridge (ADB)](https://developer.android.com/studio/command-line/adb) if you want to install the patched APK file on your device
9-
- An ABI other than ARMv7 such as x86 or x86-64 (or a custom AAPT binary that supports ARMv7)
9+
- x86 or x86-64 (For [other architectures](https://github.com/ReVanced/revanced-manager/tree/main/android/app/src/main/jniLibs) use the `--custom-aapt2-binary` option)
1010

1111
## ⏭️ Whats next
1212

0 commit comments

Comments
 (0)