From 6bba9ee0c84a7b3e537a5402d60bb536b3de6e50 Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Sun, 15 Jun 2025 10:35:08 +0200 Subject: [PATCH] fix build --- .github/workflows/build.yml | 1 + app/android/app/build.gradle | 9 +-------- app/pubspec.yaml | 14 +++----------- app/pubspec_overrides.yaml | 7 +------ 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18932ecc..40dc2594 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,6 +36,7 @@ jobs: run: echo $KEY_JKS | base64 -di > $KEY_PATH - uses: subosito/flutter-action@v2 with: + channel: stable flutter-version: 3.32.4 - run: dart pub global activate melos - run: melos bs diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle index 0dbbf8e5..212c1e30 100644 --- a/app/android/app/build.gradle +++ b/app/android/app/build.gradle @@ -74,18 +74,11 @@ android { universalApk false } } - - applicationVariants.all { variant -> - variant.outputs.all { - //rename build to make it detect by flutter - outputFileName = "../../flutter-apk/app-${variant.name}.apk" - } - } } release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig = signingConfigs.debug + signingConfig = signingConfigs.release minifyEnabled false shrinkResources false diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 3e64de66..592e984a 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: background_fetch: ^1.3.8 collection: ^1.19.1 copy_with_extension: ^6.0.1 - drift: ^2.26.1 + drift: ^2.27.0 dynamic_color: ^1.7.0 exceptions: ^0.6.1 fading_scroll: ^0.9.1 @@ -76,21 +76,13 @@ dependencies: url_launcher: ^6.3.1 uuid: ^4.5.1 - -dependency_overrides: - analyzer_plugin: - git: - url: https://github.com/dart-lang/sdk.git - ref: 8c5e06206103f8b2fd7d434ece9248ce9ac31ba4 - path: pkg/analyzer_plugin - dev_dependencies: - analyzer_plugin: ^0.13.1-wip + analyzer_plugin: ^0.13.1 build_runner: ^2.4.15 copy_with_extension_gen: ^6.0.1 custom_lint: ^0.7.5 dependency_validator: ^5.0.2 - drift_dev: ^2.26.1 + drift_dev: ^2.27.0 fast_equatable_lint: ^0.3.2 flutter_launcher_icons: ^0.14.4 go_router_builder: ^3.0.0 diff --git a/app/pubspec_overrides.yaml b/app/pubspec_overrides.yaml index 243a8355..d1cf0013 100644 --- a/app/pubspec_overrides.yaml +++ b/app/pubspec_overrides.yaml @@ -1,11 +1,6 @@ -# melos_managed_dependency_overrides: flutter_mozilla_components,simple_intent_receiver,analyzer_plugin +# melos_managed_dependency_overrides: flutter_mozilla_components,simple_intent_receiver dependency_overrides: flutter_mozilla_components: path: ../packages/flutter_mozilla_components simple_intent_receiver: path: ../packages/simple_intent_receiver - analyzer_plugin: - git: - url: https://github.com/dart-lang/sdk.git - ref: 8c5e06206103f8b2fd7d434ece9248ce9ac31ba4 - path: pkg/analyzer_plugin