Skip to content

Commit 4b7b05a

Browse files
validcubevalidcube
committed
fix: Slight tweak and use Flutter suggested config
Signed-off-by: validcube <[email protected]>
1 parent 5b6426c commit 4b7b05a

File tree

9 files changed

+55
-63
lines changed

9 files changed

+55
-63
lines changed

‎.github/workflows/build_pull_request.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Prepare comment
8888
id: prepare-comment # This should work now?
8989
run: |
90-
COMMIT_HASH=$(git rev-parse --short HEAD)
90+
echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
9191
if [[ "${{ steps.flutter-build.outcome }}" == "success" ]]; then
9292
MESSAGE="✅ Succeeded build on $COMMIT_HASH."
9393
else
@@ -108,12 +108,12 @@ jobs:
108108
109109
${{ steps.prepare-comment.outputs.MESSAGE }}
110110
111-
Details: [_execution **${{ github.run_id }}** / attempt **${{ github.run_attempt }}**_](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})!
111+
Details: [_Job execution **${{ github.run_id }}** / attempt **${{ github.run_attempt }}**_](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})!
112112
113113
### ⚙️ Workflow Steps
114114
115115
| Step | Status |
116-
| ------------------------- | :------------------------------------------------------- |
116+
| :------------------------ | :------------------------------------------------------- |
117117
| **Get dependencies** | ${{ steps.get-dependencies.outcome || job.status }} |
118118
| **Generate translations** | ${{ steps.generate-translations.outcome || job.status }} |
119119
| **Generate code files** | ${{ steps.generate-code-files.outcome || job.status }} |
@@ -123,15 +123,15 @@ jobs:
123123
124124
| Parameter | Value |
125125
| :--------------- | :--------------------------------------- |
126-
| App flavor | ${{ inputs.app-flavor }} |
126+
| App flavor | ${{ inputs.app-flavor }} |
127127
| Flutter version | ${{ inputs.flutter-version }} |
128128
| Flutter channel | ${{ inputs.flutter-channel }} |
129129
130130
- name: Upload Artifact
131131
if: steps.flutter-build.outcome == 'success'
132132
uses: actions/upload-artifact@v4
133133
with:
134-
name: revanced-manager-(${{ steps.prepare-comment.outputs.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavor }}-${{ inputs.flutter-version }})
134+
name: revanced-manager-(${{ env.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavor }}-${{ inputs.flutter-version }})
135135
path: |
136136
build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk
137137
build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk.sha1

‎.github/workflows/sync_crowdin.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
uses: subosito/flutter-action@v2
2626
with:
2727
cache: true
28-
flutter-version: 3.27.x
2928

3029
- name: Sync translations from Crowdin
3130
uses: crowdin/github-action@v2
@@ -59,13 +58,13 @@ jobs:
5958
dart run slang analyze
6059
dart run slang clean
6160
dart run slang normalize
61+
62+
dart run slang
6263
6364
cd assets/i18n
6465
dart nuke.dart >> $GITHUB_STEP_SUMMARY
6566
cd ../..
6667
67-
dart run slang
68-
6968
flutter analyze lib/gen/strings.g.dart --no-fatal-infos --no-fatal-warnings
7069
7170
- name: Commit translations

‎analysis_options.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ linter:
139139
- unnecessary_string_interpolations
140140
- unnecessary_this
141141
- unrelated_type_equality_checks
142-
- unsafe_html
143142
- use_build_context_synchronously
144143
- use_full_hex_values_for_flutter_colors
145144
- use_function_type_syntax_for_parameters

‎android/app/build.gradle.kts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545

4646
signingConfig = signingConfigs["debug"]
4747

48-
ndk.abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86_64")
48+
ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86_64")
4949
}
5050

5151
release {
@@ -64,24 +64,20 @@ android {
6464
resValue("string", "app_name", "ReVanced Manager")
6565
} else {
6666
applicationIdSuffix = ".development"
67-
68-
signingConfig = signingConfigs["debug"]
69-
7067
resValue("string", "app_name", "ReVanced Manager (Development)")
68+
signingConfig = signingConfigs["debug"]
7169
}
7270
}
7371

7472
debug {
7573
applicationIdSuffix = ".debug"
76-
7774
resValue("string", "app_name", "ReVanced Manager (Debug)")
7875
}
7976

80-
profile {
77+
named("profile") {
78+
initWith(getByName("debug"))
8179
applicationIdSuffix = ".profile"
82-
8380
resValue("string", "app_name", "ReVanced Manager (Profile)")
84-
applicationIdSuffix = ".debug"
8581
}
8682
}
8783

@@ -97,7 +93,6 @@ android {
9793
}
9894
}
9995

100-
10196
flutter {
10297
source = "../.."
10398
}
@@ -107,4 +102,3 @@ dependencies {
107102
implementation(libs.revanced.patcher)
108103
implementation(libs.revanced.library)
109104
}
110-

‎android/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
revanced-patcher = "21.0.0"
3-
revanced-library = "3.0.2"
4-
desugar_jdk_libs = "2.1.3"
3+
revanced-library = "3.1.0"
4+
desugar_jdk_libs = "2.1.4"
55

66
[libraries]
77
revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎android/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ pluginManagement {
1717

1818
plugins {
1919
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
20-
id("com.android.application") version "8.7.2" apply false
21-
id("org.jetbrains.kotlin.android") version "2.0.20" apply false
20+
id("com.android.application") version "8.8.0" apply false
21+
id("org.jetbrains.kotlin.android") version "2.1.10" apply false
2222
}
2323

2424
include(":app")

‎lib/ui/widgets/settingsView/about_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class _AboutWidgetState extends State<AboutWidget> {
2828
ClipboardData(
2929
text: 'Version: ${snapshot.data!['version']}\n'
3030
'Model: ${snapshot.data!['model']}\n'
31-
'Android Version: ${snapshot.data!['androidVersion']}\n'
31+
'Android version: ${snapshot.data!['androidVersion']}\n'
3232
'${snapshot.data!['supportedArch'].length > 1 ? 'Supported Archs' : 'Supported Arch'}: ${snapshot.data!['supportedArch'].join(", ")}\n',
3333
),
3434
);

‎pubspec.lock

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ packages:
4242
dependency: transitive
4343
description:
4444
name: async
45-
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
45+
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
4646
url: "https://pub.dev"
4747
source: hosted
48-
version: "2.11.0"
48+
version: "2.12.0"
4949
boolean_selector:
5050
dependency: transitive
5151
description:
5252
name: boolean_selector
53-
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
53+
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
5454
url: "https://pub.dev"
5555
source: hosted
56-
version: "2.1.1"
56+
version: "2.1.2"
5757
build:
5858
dependency: transitive
5959
description:
@@ -122,10 +122,10 @@ packages:
122122
dependency: transitive
123123
description:
124124
name: characters
125-
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
125+
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
126126
url: "https://pub.dev"
127127
source: hosted
128-
version: "1.3.0"
128+
version: "1.4.0"
129129
checked_yaml:
130130
dependency: transitive
131131
description:
@@ -138,10 +138,10 @@ packages:
138138
dependency: transitive
139139
description:
140140
name: clock
141-
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
141+
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
142142
url: "https://pub.dev"
143143
source: hosted
144-
version: "1.1.1"
144+
version: "1.1.2"
145145
code_builder:
146146
dependency: transitive
147147
description:
@@ -154,10 +154,10 @@ packages:
154154
dependency: "direct main"
155155
description:
156156
name: collection
157-
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
157+
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
158158
url: "https://pub.dev"
159159
source: hosted
160-
version: "1.19.0"
160+
version: "1.19.1"
161161
connectivity_plus:
162162
dependency: "direct main"
163163
description:
@@ -299,10 +299,10 @@ packages:
299299
dependency: transitive
300300
description:
301301
name: fake_async
302-
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
302+
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
303303
url: "https://pub.dev"
304304
source: hosted
305-
version: "1.3.1"
305+
version: "1.3.2"
306306
ffi:
307307
dependency: transitive
308308
description:
@@ -599,18 +599,18 @@ packages:
599599
dependency: transitive
600600
description:
601601
name: leak_tracker
602-
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
602+
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
603603
url: "https://pub.dev"
604604
source: hosted
605-
version: "10.0.7"
605+
version: "10.0.8"
606606
leak_tracker_flutter_testing:
607607
dependency: transitive
608608
description:
609609
name: leak_tracker_flutter_testing
610-
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
610+
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
611611
url: "https://pub.dev"
612612
source: hosted
613-
version: "3.0.8"
613+
version: "3.0.9"
614614
leak_tracker_testing:
615615
dependency: transitive
616616
description:
@@ -672,10 +672,10 @@ packages:
672672
dependency: transitive
673673
description:
674674
name: matcher
675-
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
675+
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
676676
url: "https://pub.dev"
677677
source: hosted
678-
version: "0.12.16+1"
678+
version: "0.12.17"
679679
material_color_utilities:
680680
dependency: transitive
681681
description:
@@ -688,10 +688,10 @@ packages:
688688
dependency: transitive
689689
description:
690690
name: meta
691-
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
691+
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
692692
url: "https://pub.dev"
693693
source: hosted
694-
version: "1.15.0"
694+
version: "1.16.0"
695695
mime:
696696
dependency: transitive
697697
description:
@@ -744,10 +744,10 @@ packages:
744744
dependency: transitive
745745
description:
746746
name: path
747-
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
747+
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
748748
url: "https://pub.dev"
749749
source: hosted
750-
version: "1.9.0"
750+
version: "1.9.1"
751751
path_provider:
752752
dependency: "direct main"
753753
description:
@@ -1072,10 +1072,10 @@ packages:
10721072
dependency: transitive
10731073
description:
10741074
name: source_span
1075-
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
1075+
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
10761076
url: "https://pub.dev"
10771077
source: hosted
1078-
version: "1.10.0"
1078+
version: "1.10.1"
10791079
sprintf:
10801080
dependency: transitive
10811081
description:
@@ -1128,10 +1128,10 @@ packages:
11281128
dependency: transitive
11291129
description:
11301130
name: stack_trace
1131-
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
1131+
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
11321132
url: "https://pub.dev"
11331133
source: hosted
1134-
version: "1.12.0"
1134+
version: "1.12.1"
11351135
stacked:
11361136
dependency: "direct main"
11371137
description:
@@ -1168,10 +1168,10 @@ packages:
11681168
dependency: transitive
11691169
description:
11701170
name: stream_channel
1171-
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
1171+
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
11721172
url: "https://pub.dev"
11731173
source: hosted
1174-
version: "2.1.2"
1174+
version: "2.1.4"
11751175
stream_transform:
11761176
dependency: transitive
11771177
description:
@@ -1184,10 +1184,10 @@ packages:
11841184
dependency: transitive
11851185
description:
11861186
name: string_scanner
1187-
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
1187+
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
11881188
url: "https://pub.dev"
11891189
source: hosted
1190-
version: "1.3.0"
1190+
version: "1.4.1"
11911191
synchronized:
11921192
dependency: "direct main"
11931193
description:
@@ -1200,18 +1200,18 @@ packages:
12001200
dependency: transitive
12011201
description:
12021202
name: term_glyph
1203-
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
1203+
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
12041204
url: "https://pub.dev"
12051205
source: hosted
1206-
version: "1.2.1"
1206+
version: "1.2.2"
12071207
test_api:
12081208
dependency: transitive
12091209
description:
12101210
name: test_api
1211-
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
1211+
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
12121212
url: "https://pub.dev"
12131213
source: hosted
1214-
version: "0.7.3"
1214+
version: "0.7.4"
12151215
timeago:
12161216
dependency: "direct main"
12171217
description:
@@ -1336,10 +1336,10 @@ packages:
13361336
dependency: transitive
13371337
description:
13381338
name: vm_service
1339-
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
1339+
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
13401340
url: "https://pub.dev"
13411341
source: hosted
1342-
version: "14.3.0"
1342+
version: "14.3.1"
13431343
wakelock_plus:
13441344
dependency: "direct main"
13451345
description:
@@ -1429,5 +1429,5 @@ packages:
14291429
source: hosted
14301430
version: "3.1.2"
14311431
sdks:
1432-
dart: ">=3.6.0 <4.0.0"
1432+
dart: ">=3.7.0-0 <4.0.0"
14331433
flutter: ">=3.24.0"

0 commit comments

Comments
 (0)