Skip to content

Commit 4f6197c

Browse files
UshieoSumAtrIX
authored andcommitted
feat!: Bump major version
BREAKING CHANGE: bump major version to 2.0.0
1 parent 6bc8983 commit 4f6197c

3 files changed

Lines changed: 74 additions & 70 deletions

File tree

.github/workflows/release.yml

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
name: Release
22

33
on:
4-
workflow_dispatch:
5-
push:
6-
branches:
7-
- main
8-
- dev
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
- dev
99

1010
jobs:
11-
release:
12-
name: Release
13-
permissions:
14-
contents: write
15-
packages: write
16-
id-token: write
17-
attestations: write
18-
artifact-metadata: write
19-
runs-on: ubuntu-latest
20-
steps:
21-
- name: Checkout
22-
uses: actions/checkout@v6
11+
release:
12+
name: Release
13+
permissions:
14+
contents: write
15+
packages: write
16+
id-token: write
17+
attestations: write
18+
artifact-metadata: write
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v6
2323

24-
- name: Setup Java
25-
uses: actions/setup-java@v5
26-
with:
27-
distribution: 'temurin'
28-
java-version: '17'
24+
- name: Setup Java
25+
uses: actions/setup-java@v5
26+
with:
27+
distribution: "temurin"
28+
java-version: "17"
2929

30-
- name: Cache Gradle
31-
uses: burrunan/gradle-cache-action@v3
30+
- name: Cache Gradle
31+
uses: burrunan/gradle-cache-action@v3
3232

33-
- name: Build
34-
env:
35-
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
36-
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
37-
run: ./gradlew assembleRelease
33+
- name: Build
34+
env:
35+
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
36+
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
37+
run: ./gradlew assembleRelease
3838

39-
- name: Setup Node.js
40-
uses: actions/setup-node@v6
41-
with:
42-
node-version: "lts/*"
43-
cache: 'npm'
39+
- name: Setup Node.js
40+
uses: actions/setup-node@v6
41+
with:
42+
node-version: "lts/*"
43+
cache: "npm"
4444

45-
- name: Install dependencies
46-
run: npm ci
45+
- name: Install dependencies
46+
run: npm ci
4747

48-
- name: Import GPG key
49-
uses: crazy-max/ghaction-import-gpg@v7
50-
with:
51-
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
52-
passphrase: ${{ secrets.GPG_PASSPHRASE }}
53-
fingerprint: ${{ vars.GPG_FINGERPRINT }}
48+
- name: Import GPG key
49+
uses: crazy-max/ghaction-import-gpg@v7
50+
with:
51+
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
52+
passphrase: ${{ secrets.GPG_PASSPHRASE }}
53+
fingerprint: ${{ vars.GPG_FINGERPRINT }}
5454

55-
- name: Setup keystore
56-
run: |
57-
echo "${{ secrets.KEYSTORE }}" | base64 --decode > "app/keystore.jks"
55+
- name: Setup keystore
56+
run: |
57+
echo "${{ secrets.KEYSTORE }}" | base64 --decode > "app/keystore.jks"
5858
59-
- name: Release API
60-
run: npx multi-semantic-release --tag-format 'api@${version}' --ignore-packages app
61-
env:
62-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63-
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
64-
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
59+
- name: Release API
60+
run: npx multi-semantic-release --tag-format 'api@${version}' --ignore-packages app
61+
env:
62+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
64+
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
6565

66-
- name: Release
67-
id: release
68-
run: |
69-
echo "NEW_TAG=$(npx multi-semantic-release --tag-format 'v${version}' --ignore-packages api | tee | grep 'Created tag ' | sed -E 's/.*Created tag ([^ ]+).*/\1/')" >> $GITHUB_OUTPUT
70-
env:
71-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72-
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
73-
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
74-
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
75-
KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
76-
KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
66+
- name: Release
67+
id: release
68+
run: |
69+
npx multi-semantic-release --tag-format 'v${version}' --ignore-packages api
70+
env:
71+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72+
ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
73+
ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
74+
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
75+
KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
76+
KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
7777

78-
- name: Attest
79-
if: steps.release.outputs.NEW_TAG != ''
80-
uses: actions/attest@v4
81-
with:
82-
subject-name: 'ReVanced Manager ${{ steps.release.outputs.NEW_TAG }}'
83-
subject-path: app/build/outputs/apk/release/revanced-manager*.apk
78+
- name: Attest
79+
if: steps.release.outputs.NEW_TAG != ''
80+
uses: actions/attest@v4
81+
with:
82+
subject-name: "ReVanced Manager ${{ steps.release.outputs.NEW_TAG }}"
83+
subject-path: app/build/outputs/apk/release/revanced-manager*.apk

app/src/main/java/app/revanced/manager/ui/screen/OnboardingScreen.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,10 @@ fun OnboardingScreen(
293293
}
294294
},
295295
dismissButton = {
296-
TextButton(onClick = { showSkipPermissionsDialog = false }, shapes = ButtonDefaults.shapes()) {
296+
TextButton(
297+
onClick = { showSkipPermissionsDialog = false },
298+
shapes = ButtonDefaults.shapes()
299+
) {
297300
Text(stringResource(R.string.cancel))
298301
}
299302
}

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ kotlin.code.style=official
44
org.gradle.caching=true
55
android.builtInKotlin=false
66
android.nonFinalResIds=false
7-
org.gradle.configuration-cache=true
7+
# Must be disabled for now, otherwise :app:publish task fails.
8+
org.gradle.configuration-cache=false
89
org.gradle.configuration-cache.parallel=true
910
org.gradle.parallel=true
1011
org.gradle.tooling.parallel=true

0 commit comments

Comments
 (0)