diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 8f42bf70..448d2a73 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -87,7 +87,7 @@ jobs: - name: Prepare comment id: prepare-comment # This should work now? run: | - COMMIT_HASH=$(git rev-parse --short HEAD) + echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV if [[ "${{ steps.flutter-build.outcome }}" == "success" ]]; then MESSAGE="✅ Succeeded build on $COMMIT_HASH." else @@ -108,12 +108,12 @@ jobs: ${{ steps.prepare-comment.outputs.MESSAGE }} - Details: [_execution **${{ github.run_id }}** / attempt **${{ github.run_attempt }}**_](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})! + Details: [_Job execution **${{ github.run_id }}** / attempt **${{ github.run_attempt }}**_](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})! ### ⚙️ Workflow Steps | Step | Status | - | ------------------------- | :------------------------------------------------------- | + | :------------------------ | :------------------------------------------------------- | | **Get dependencies** | ${{ steps.get-dependencies.outcome || job.status }} | | **Generate translations** | ${{ steps.generate-translations.outcome || job.status }} | | **Generate code files** | ${{ steps.generate-code-files.outcome || job.status }} | @@ -123,7 +123,7 @@ jobs: | Parameter | Value | | :--------------- | :--------------------------------------- | - | App flavor | ${{ inputs.app-flavor }} | + | App flavor | ${{ inputs.app-flavor }} | | Flutter version | ${{ inputs.flutter-version }} | | Flutter channel | ${{ inputs.flutter-channel }} | @@ -131,7 +131,7 @@ jobs: if: steps.flutter-build.outcome == 'success' uses: actions/upload-artifact@v4 with: - name: revanced-manager-(${{ steps.prepare-comment.outputs.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavor }}-${{ inputs.flutter-version }}) + name: revanced-manager-(${{ env.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavor }}-${{ inputs.flutter-version }}) path: | build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk.sha1 diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml index 96146c1f..41f3b35c 100644 --- a/.github/workflows/sync_crowdin.yml +++ b/.github/workflows/sync_crowdin.yml @@ -25,7 +25,6 @@ jobs: uses: subosito/flutter-action@v2 with: cache: true - flutter-version: 3.27.x - name: Sync translations from Crowdin uses: crowdin/github-action@v2 @@ -59,13 +58,13 @@ jobs: dart run slang analyze dart run slang clean dart run slang normalize + + dart run slang cd assets/i18n dart nuke.dart >> $GITHUB_STEP_SUMMARY cd ../.. - dart run slang - flutter analyze lib/gen/strings.g.dart --no-fatal-infos --no-fatal-warnings - name: Commit translations diff --git a/analysis_options.yaml b/analysis_options.yaml index f26f3dc4..efd09a41 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -139,7 +139,6 @@ linter: - unnecessary_string_interpolations - unnecessary_this - unrelated_type_equality_checks - - unsafe_html - use_build_context_synchronously - use_full_hex_values_for_flutter_colors - use_function_type_syntax_for_parameters diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 50fe0be5..289feb1c 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -45,7 +45,7 @@ android { signingConfig = signingConfigs["debug"] - ndk.abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86_64") + ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86_64") } release { @@ -64,24 +64,20 @@ android { resValue("string", "app_name", "ReVanced Manager") } else { applicationIdSuffix = ".development" - - signingConfig = signingConfigs["debug"] - resValue("string", "app_name", "ReVanced Manager (Development)") + signingConfig = signingConfigs["debug"] } } debug { applicationIdSuffix = ".debug" - resValue("string", "app_name", "ReVanced Manager (Debug)") } - profile { + named("profile") { + initWith(getByName("debug")) applicationIdSuffix = ".profile" - resValue("string", "app_name", "ReVanced Manager (Profile)") - applicationIdSuffix = ".debug" } } @@ -97,7 +93,6 @@ android { } } - flutter { source = "../.." } @@ -107,4 +102,3 @@ dependencies { implementation(libs.revanced.patcher) implementation(libs.revanced.library) } - diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 352a5400..acac669c 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] revanced-patcher = "21.0.0" -revanced-library = "3.0.2" -desugar_jdk_libs = "2.1.3" +revanced-library = "3.1.0" +desugar_jdk_libs = "2.1.4" [libraries] revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 2b189974..d7104778 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 3a247b83..680cab23 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -17,8 +17,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.7.2" apply false - id("org.jetbrains.kotlin.android") version "2.0.20" apply false + id("com.android.application") version "8.8.0" apply false + id("org.jetbrains.kotlin.android") version "2.1.10" apply false } include(":app") diff --git a/lib/ui/widgets/settingsView/about_widget.dart b/lib/ui/widgets/settingsView/about_widget.dart index 1b087d5a..a3a96404 100644 --- a/lib/ui/widgets/settingsView/about_widget.dart +++ b/lib/ui/widgets/settingsView/about_widget.dart @@ -28,7 +28,7 @@ class _AboutWidgetState extends State { ClipboardData( text: 'Version: ${snapshot.data!['version']}\n' 'Model: ${snapshot.data!['model']}\n' - 'Android Version: ${snapshot.data!['androidVersion']}\n' + 'Android version: ${snapshot.data!['androidVersion']}\n' '${snapshot.data!['supportedArch'].length > 1 ? 'Supported Archs' : 'Supported Arch'}: ${snapshot.data!['supportedArch'].join(", ")}\n', ), ); diff --git a/pubspec.lock b/pubspec.lock index e5dc9af5..3085bc9a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,18 +42,18 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: @@ -122,10 +122,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -138,10 +138,10 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: @@ -154,10 +154,10 @@ packages: dependency: "direct main" description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" connectivity_plus: dependency: "direct main" description: @@ -299,10 +299,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -599,18 +599,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -672,10 +672,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -688,10 +688,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -744,10 +744,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_provider: dependency: "direct main" description: @@ -1072,10 +1072,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -1128,10 +1128,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" stacked: dependency: "direct main" description: @@ -1168,10 +1168,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: @@ -1184,10 +1184,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" synchronized: dependency: "direct main" description: @@ -1200,18 +1200,18 @@ packages: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" timeago: dependency: "direct main" description: @@ -1336,10 +1336,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" wakelock_plus: dependency: "direct main" description: @@ -1429,5 +1429,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.24.0"