Skip to content

Commit 164d09d

Browse files
authored
chore: Merge branch dev to main (#309)
2 parents 3c26457 + 1e92239 commit 164d09d

23 files changed

+950
-5065
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[*.{kt,kts}]
2+
ktlint_code_style = intellij_idea
3+
ktlint_standard_no-wildcard-imports = disabled
File renamed without changes.

.github/dependabot.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
labels: []
5+
directory: /
6+
target-branch: dev
7+
schedule:
8+
interval: monthly
9+
10+
- package-ecosystem: npm
11+
labels: []
12+
directory: /
13+
target-branch: dev
14+
schedule:
15+
interval: monthly
16+
17+
- package-ecosystem: gradle
18+
labels: []
19+
directory: /
20+
target-branch: dev
21+
schedule:
22+
interval: monthly
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Build pull request
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- dev
8+
9+
jobs:
10+
release:
11+
name: Build
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Cache Gradle
20+
uses: burrunan/gradle-cache-action@v1
21+
22+
- name: Build
23+
env:
24+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
run: ./gradlew build --no-daemon

.github/workflows/release.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ on:
66
branches:
77
- main
88
- dev
9-
pull_request:
10-
branches:
11-
- main
12-
- dev
139

1410
jobs:
1511
release:
@@ -24,25 +20,30 @@ jobs:
2420
persist-credentials: false
2521
fetch-depth: 0
2622

27-
- name: Cache Node modules
28-
uses: actions/cache@v3
29-
with:
30-
path: |
31-
node_modules
32-
key: npm-${{ hashFiles('package-lock.json') }}
33-
3423
- name: Cache Gradle
3524
uses: burrunan/gradle-cache-action@v1
3625

3726
- name: Build
3827
env:
3928
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40-
# Cleaning is necessary to avoid uploading two identical artifacts with different versions
41-
run: ./gradlew clean --no-daemon
29+
run: ./gradlew build clean
4230

43-
- name: Setup semantic-release
31+
- name: Setup Node.js
32+
uses: actions/setup-node@v4
33+
with:
34+
node-version: "lts/*"
35+
cache: 'npm'
36+
37+
- name: Install dependencies
4438
run: npm install
4539

40+
- name: Import GPG key
41+
uses: crazy-max/ghaction-import-gpg@v6
42+
with:
43+
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
44+
passphrase: ${{ secrets.GPG_PASSPHRASE }}
45+
fingerprint: ${{ env.GPG_FINGERPRINT }}
46+
4647
- name: Release
4748
env:
4849
GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

.github/workflows/update-documentation.yml renamed to .github/workflows/update_documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Dispatch event to documentation repository
1212
if: github.ref == 'refs/heads/main'
1313
steps:
14-
- uses: peter-evans/repository-dispatch@v2
14+
- uses: peter-evans/repository-dispatch@v3
1515
with:
1616
token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN }}
1717
repository: revanced/revanced-documentation

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,7 @@ node_modules/
119119

120120
# ReVanced CLI
121121
revanced-cache/
122-
options.toml
122+
options.toml
123+
124+
# Generated by an Android project (such as ReVanced Integrations)
125+
local.properties

.releaserc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
{
3232
"assets": [
3333
{
34-
"path": "build/libs/*all.jar"
34+
"path": "build/libs/*-all*"
3535
}
3636
],
3737
successComment: false

0 commit comments

Comments
 (0)