Skip to content

Commit 5b9b3b5

Browse files
oSumAtrIXlaur89semantic-release-botvalidcube
authored
chore: Merge branch dev to main (#366)
Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de> Co-authored-by: laur89 <laur89@users.noreply.github.com> Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net> Co-authored-by: Pun Butrach <pun.butrach@gmail.com>
2 parents a0189ae + ad23a88 commit 5b9b3b5

24 files changed

Lines changed: 2481 additions & 3568 deletions

.editorconfig

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/build_pull_request.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
16-
with:
17-
fetch-depth: 0
15+
uses: actions/checkout@v6
1816

1917
- name: Cache Gradle
20-
uses: burrunan/gradle-cache-action@v1
18+
uses: burrunan/gradle-cache-action@v3
2119

2220
- name: Build
2321
env:
24-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ env.GITHUB_ACTOR }}
23+
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
2524
run: ./gradlew build --no-daemon

.github/workflows/open_pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919

2020
- name: Open pull request
2121
uses: repo-sync/pull-request@v2

.github/workflows/release.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,24 @@ jobs:
1212
name: Release
1313
permissions:
1414
contents: write
15+
id-token: write
16+
attestations: write
1517
runs-on: ubuntu-latest
1618
steps:
1719
- name: Checkout
18-
uses: actions/checkout@v4
19-
with:
20-
# Make sure the release step uses its own credentials:
21-
# https://github.com/cycjimmy/semantic-release-action#private-packages
22-
persist-credentials: false
23-
fetch-depth: 0
20+
uses: actions/checkout@v6
2421

2522
- name: Cache Gradle
26-
uses: burrunan/gradle-cache-action@v1
23+
uses: burrunan/gradle-cache-action@v3
2724

2825
- name: Build
2926
env:
30-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ env.GITHUB_ACTOR }}
28+
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
3129
run: ./gradlew build clean
3230

3331
- name: Setup Node.js
34-
uses: actions/setup-node@v4
32+
uses: actions/setup-node@v6
3533
with:
3634
node-version: "lts/*"
3735
cache: 'npm'
@@ -47,6 +45,16 @@ jobs:
4745
fingerprint: ${{ vars.GPG_FINGERPRINT }}
4846

4947
- name: Release
48+
uses: cycjimmy/semantic-release-action@v5
49+
id: release
5050
env:
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52-
run: npm exec semantic-release
52+
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ env.GITHUB_ACTOR }}
53+
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
54+
55+
- name: Attest
56+
if: steps.release.outputs.new_release_published == 'true'
57+
uses: actions/attest-build-provenance@v3
58+
with:
59+
subject-name: 'ReVanced CLI ${{ steps.release.outputs.new_release_git_tag }}'
60+
subject-path: build/libs/revanced-cli*.jar

.releaserc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@
3939
}
4040
],
4141
[
42-
"@saithodev/semantic-release-backmerge",
42+
"@kilianpaquier/semantic-release-backmerge",
4343
{
44-
backmergeBranches: [{"from": "main", "to": "dev"}],
45-
clearWorkspace: true
44+
"targets": [{ "from": "main", "to": "dev" }]
4645
}
4746
]
4847
]

CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
# [6.0.0-dev.2](https://github.com/ReVanced/revanced-cli/compare/v6.0.0-dev.1...v6.0.0-dev.2) (2026-02-26)
2+
3+
4+
### Features
5+
6+
* Add signature and build provenance verification ([f481462](https://github.com/ReVanced/revanced-cli/commit/f481462ccf2eb55d1f964c0f3934bf2b29f4b0ef))
7+
8+
# [6.0.0-dev.1](https://github.com/ReVanced/revanced-cli/compare/v5.0.2-dev.2...v6.0.0-dev.1) (2026-02-21)
9+
10+
11+
* build(Needs bump)!: Update to ReVanced Patcher v22 ([#385](https://github.com/ReVanced/revanced-cli/issues/385)) ([30f36ee](https://github.com/ReVanced/revanced-cli/commit/30f36ee270d4b63b69bf7949c7968f2827c395ce))
12+
13+
14+
### BREAKING CHANGES
15+
16+
* ReVanced CLI switches to ReVanced Patcher v22 and will therefore be incompatible with patches from older versions of ReVanced Patcher.
17+
18+
## [5.0.2-dev.2](https://github.com/ReVanced/revanced-cli/compare/v5.0.2-dev.1...v5.0.2-dev.2) (2025-04-25)
19+
20+
21+
### Bug Fixes
22+
23+
* Do not print patch description if null ([bba90fe](https://github.com/ReVanced/revanced-cli/commit/bba90fede85e4632efb9509e5bcf9091a9435549))
24+
25+
## [5.0.2-dev.1](https://github.com/ReVanced/revanced-cli/compare/v5.0.1...v5.0.2-dev.1) (2025-04-20)
26+
27+
28+
### Bug Fixes
29+
30+
* Group `mount` and `install` options into an argument group ([#364](https://github.com/ReVanced/revanced-cli/issues/364)) ([0c53a2d](https://github.com/ReVanced/revanced-cli/commit/0c53a2d1d75d3d934d134594751fe6cd0b000d1a))
31+
132
## [5.0.1](https://github.com/ReVanced/revanced-cli/compare/v5.0.0...v5.0.1) (2025-04-14)
233

334

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ To build a ReVanced CLI, you can follow the [documentation](/docs).
100100

101101
You can find the documentation of ReVanced CLI [here](/docs).
102102

103-
## 📜 Licence
103+
## 📜 License
104104

105105
ReVanced CLI is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.
106106
[tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced CLI as long as you track changes/dates in source files.

build.gradle.kts

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2-
31
plugins {
42
alias(libs.plugins.kotlin)
53
alias(libs.plugins.shadow)
@@ -14,20 +12,9 @@ application {
1412
mainClass = "app.revanced.cli.command.MainCommandKt"
1513
}
1614

17-
repositories {
18-
mavenCentral()
19-
google()
20-
maven {
21-
// A repository must be specified for some reason. "registry" is a dummy.
22-
url = uri("https://maven.pkg.github.com/revanced/registry")
23-
credentials {
24-
username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
25-
password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
26-
}
27-
}
28-
}
29-
3015
dependencies {
16+
implementation(libs.bcpg.jdk18on)
17+
implementation(libs.sigstore.java)
3118
implementation(libs.revanced.patcher)
3219
implementation(libs.revanced.library)
3320
implementation(libs.kotlinx.coroutines.core)
@@ -38,12 +25,13 @@ dependencies {
3825

3926
kotlin {
4027
compilerOptions {
41-
jvmTarget.set(JvmTarget.JVM_11)
42-
}
43-
}
28+
jvmToolchain(17)
4429

45-
java {
46-
targetCompatibility = JavaVersion.VERSION_11
30+
freeCompilerArgs.addAll(
31+
"-Xexplicit-backing-fields",
32+
"-Xcontext-parameters",
33+
)
34+
}
4735
}
4836

4937
tasks {
@@ -62,7 +50,8 @@ tasks {
6250
exclude("/prebuilt/linux/aapt", "/prebuilt/windows/aapt.exe", "/prebuilt/*/aapt_*")
6351
minimize {
6452
exclude(dependency("org.bouncycastle:.*"))
65-
exclude(dependency("app.revanced:revanced-patcher"))
53+
exclude(dependency("app.revanced:patcher"))
54+
exclude(dependency("commons-logging:commons-logging"))
6655
}
6756
}
6857

@@ -76,10 +65,6 @@ tasks {
7665

7766
// The maven-publish is also necessary to make the signing plugin work.
7867
publishing {
79-
repositories {
80-
mavenLocal()
81-
}
82-
8368
publications {
8469
create<MavenPublication>("revanced-cli-publication") {
8570
from(components["java"])

0 commit comments

Comments
 (0)