Skip to content

Commit d81808a

Browse files
authored
chore: Merge branch dev to main (#1857)
2 parents a23f032 + ea9654e commit d81808a

File tree

132 files changed

+6749
-3932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+6749
-3932
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 5 additions & 5 deletions
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-manager/labels/Bug%20report).
73+
- **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-manager/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-manager/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
@@ -99,14 +99,14 @@ body:
9999
- type: textarea
100100
attributes:
101101
label: ReVanced Manager logs
102-
description: Export logs in ReVanced Manager settings.
102+
description: Export logs from the ReVanced Manager settings.
103103
render: shell
104104
validations:
105105
required: true
106106
- type: textarea
107107
attributes:
108108
label: Patch logs
109-
description: Export logs in "Patcher" screen.
109+
description: Export logs from the "Patcher" screen.
110110
render: shell
111111
validations:
112112
required: false
@@ -116,11 +116,11 @@ body:
116116
label: Acknowledgements
117117
description: Your bug report will be closed if you don't follow the checklist below.
118118
options:
119-
- label: This issue is not a duplicate of an existing bug report.
119+
- label: I have checked all open and closed bug reports and this is not a duplicate.
120120
required: true
121121
- label: I have chosen an appropriate title.
122122
required: true
123123
- label: All requested information has been provided properly.
124124
required: true
125-
- label: The bug is only related to ReVanced Manager
125+
- label: The bug is only related to ReVanced Manager.
126126
required: true

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ 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-manager//labels/Feature%20request).
73+
- **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-manager/issues?q=label%3A%22Feature+request%22).
7474
- **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-manager/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
@@ -79,7 +79,6 @@ body:
7979
description: |
8080
- Describe your feature in detail
8181
- Add images, videos, links, examples, references, etc. if possible
82-
- Add the target application name in case you request a new patch
8382
- type: textarea
8483
attributes:
8584
label: Motivation
@@ -98,9 +97,9 @@ body:
9897
label: Acknowledgements
9998
description: Your feature request will be closed if you don't follow the checklist below.
10099
options:
101-
- label: This issue is not a duplicate of an existing feature request.
100+
- label: I have checked all open and closed feature requests and this is not a duplicate.
102101
required: true
103102
- label: I have chosen an appropriate title.
104103
required: true
105-
- label: The feature request is only related to ReVanced Manager
104+
- label: The feature request is only related to ReVanced Manager.
106105
required: true

.github/workflows/build_pull_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
uses: subosito/flutter-action@v2
6262
with:
6363
channel: "stable"
64+
flutter-version: 3.22.x
6465
cache: ${{ inputs.flutter-cache }}
6566

6667
- name: Get dependencies

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ jobs:
3636
uses: subosito/flutter-action@v2
3737
with:
3838
channel: "stable"
39+
flutter-version: 3.22.x
3940

4041
- name: Install dependencies
41-
run: npm install
42+
run: npm ci
4243

4344
- name: Get dependencies
4445
run: flutter pub get

.github/workflows/sync_crowdin.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
schedule:
66
- cron: 00 12 * * 1
77
push:
8+
branches: dev
89
paths:
910
- assets/i18n/*.json
1011
- assets/i18n/*.dart
@@ -20,8 +21,11 @@ jobs:
2021
with:
2122
fetch-depth: 0
2223

23-
- name: Setup Dart
24-
uses: dart-lang/setup-dart@v1
24+
- name: Setup Flutter
25+
uses: subosito/flutter-action@v2
26+
with:
27+
cache: true
28+
flutter-version: 3.22.x
2529

2630
- name: Sync translations from Crowdin
2731
uses: crowdin/github-action@v1
@@ -43,17 +47,27 @@ jobs:
4347
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
4448
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
4549

46-
- name: Remove empty values from JSON
50+
- name: Generate Translation Strings
51+
run: |
52+
dart pub get
53+
dart run slang
54+
flutter analyze lib/gen/strings.g.dart --no-fatal-infos --no-fatal-warnings
55+
56+
- name: Remove empty values & Validation of Translation Strings
4757
run: |
58+
dart run slang analyze
59+
dart run slang clean
60+
dart run slang normalize
4861
cd assets/i18n
4962
sudo chmod 777 *.json
5063
dart nuke.dart >> $GITHUB_STEP_SUMMARY
64+
flutter analyze lib/gen/strings.g.dart --no-fatal-infos --no-fatal-warnings
5165
5266
- name: Commit translations
5367
run: |
5468
git config user.name revanced-bot
5569
git config user.email [email protected]
5670
sudo chown -R $USER:$USER .git
57-
git add assets/i18n/*.json
58-
git commit -m "chore: Remove empty values from JSON" assets/i18n/*.json
71+
git add assets/i18n/strings.*.json
72+
git commit -m "chore: Remove empty values from JSON" assets/i18n/strings.*.json
5973
git push origin HEAD:feat/translations

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Some of the features ReVanced Manager provides are:
8080

8181
## 🔽 Download
8282

83-
You can download the most recent version of ReVanced Manager at [revanced.app/download](https://revanced.app/download) or from [GitHub releases](https://github.com/ReVanced/revanced-manager/releases).
83+
You can download the most recent version of ReVanced Manager at [revanced.app/download](https://revanced.app/download) or from [GitHub releases](https://github.com/ReVanced/revanced-manager/releases/latest).
8484
Learn how to use ReVanced Manager by following the [documentation](/docs).
8585

8686
## 📚 Everything else
@@ -98,10 +98,6 @@ To build a ReVanced Manager, you can follow the [documentation](/docs).
9898

9999
You can find the documentation for ReVanced Manager [here](/docs).
100100

101-
### 👋 Contributing
102-
103-
Thank you for considering contributing to ReVanced Manager. You can find the contribution guidelines [here](/CONTRIBUTING.md).
104-
105101
## ⚖️ License
106102

107103
ReVanced Manager is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.

android/app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ if (flutterVersionName == null) {
2323
}
2424

2525
android {
26-
compileSdk flutter.compileSdkVersion
27-
ndkVersion flutter.ndkVersion
26+
compileSdk 34
2827

2928
compileOptions {
29+
coreLibraryDesugaringEnabled true
3030
sourceCompatibility JavaVersion.VERSION_17
3131
targetCompatibility JavaVersion.VERSION_17
3232
}
@@ -113,6 +113,7 @@ flutter {
113113
}
114114

115115
dependencies {
116+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") // https://pub.dev/packages/flutter_local_notifications#gradle-setup
116117
implementation("app.revanced:revanced-patcher:19.3.1")
117118
implementation("app.revanced:revanced-library:2.2.1")
118119
}

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
android:name="${applicationName}"
2727
android:icon="@mipmap/ic_launcher"
2828
android:largeHeap="true"
29-
android:requestLegacyExternalStorage="true">
29+
android:requestLegacyExternalStorage="true"
30+
android:enableOnBackInvokedCallback="true">
3031
<activity
3132
android:name=".MainActivity"
3233
android:exported="true"
Binary file not shown.

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
org.gradle.jvmargs=-Xmx1536M -XX:+UseParallelGC
1+
org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC
22
org.gradle.parallel=true
33
org.gradle.daemon=true
44
org.gradle.caching=true

0 commit comments

Comments
 (0)