Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update dependency flutter to v3.24.2 #2452

Merged
merged 1 commit into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutter": "3.22.3",
"flutter": "3.24.2",
"updateVscodeSettings": false
}
2 changes: 1 addition & 1 deletion .github/workflows/conventional_commits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install dart
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
with:
sdk: 3.4
sdk: 3.5
- name: Install commitlint_cli
run: dart pub get

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install dart
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
with:
sdk: 3.4
sdk: 3.5
- name: Setup
run: ./tool/setup.sh

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Install dart
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
with:
sdk: 3.4
sdk: 3.5
- name: Setup
run: ./tool/setup.sh

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install dart
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
with:
sdk: 3.4
sdk: 3.5
- name: Setup
run: ./tool/setup.sh

Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Install dart
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
with:
sdk: 3.4
sdk: 3.5
- name: Setup
run: ./tool/setup.sh
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install dart
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
with:
sdk: 3.4
sdk: 3.5
- name: Setup
run: ./tool/setup.sh

Expand Down
1 change: 1 addition & 0 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ scripts:
format:check: dart format --output=none --set-exit-if-changed --line-length 120 .
analyze: >
dart analyze --fatal-infos . &&
rm -rf packages/neon_framework/example/linux/flutter/ephemeral/ &&
dart run custom_lint --fatal-infos .
test: >
melos run test:dart &&
Expand Down
61 changes: 37 additions & 24 deletions packages/neon_framework/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
url: "https://pub.dev"
source: hosted
version: "67.0.0"
version: "72.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
url: "https://pub.dev"
source: hosted
version: "6.4.1"
version: "6.7.0"
analyzer_plugin:
dependency: transitive
description:
Expand Down Expand Up @@ -244,26 +249,26 @@ packages:
dependency: "direct dev"
description:
name: custom_lint
sha256: "7c0aec12df22f9082146c354692056677f1e70bc43471644d1fdb36c6fdda799"
sha256: "4939d89e580c36215e48a7de8fd92f22c79dcc3eb11fda84f3402b3b45aec663"
url: "https://pub.dev"
source: hosted
version: "0.6.4"
version: "0.6.5"
custom_lint_builder:
dependency: transitive
description:
name: custom_lint_builder
sha256: d7dc41e709dde223806660268678be7993559e523eb3164e2a1425fd6f7615a9
sha256: d9e5bb63ed52c1d006f5a1828992ba6de124c27a531e8fba0a31afffa81621b3
url: "https://pub.dev"
source: hosted
version: "0.6.4"
version: "0.6.5"
custom_lint_core:
dependency: transitive
description:
name: custom_lint_core
sha256: a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6
sha256: "4ddbbdaa774265de44c97054dcec058a83d9081d071785ece601e348c18c267d"
url: "https://pub.dev"
source: hosted
version: "0.6.3"
version: "0.6.5"
dart_style:
dependency: transitive
description:
Expand Down Expand Up @@ -749,18 +754,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev"
source: hosted
version: "10.0.4"
version: "10.0.5"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
version: "3.0.5"
leak_tracker_testing:
dependency: transitive
description:
Expand All @@ -785,6 +790,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.2.0"
macros:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
markdown:
dependency: transitive
description:
Expand All @@ -805,18 +818,18 @@ packages:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "0.8.0"
version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.15.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -1182,10 +1195,10 @@ packages:
dependency: transitive
description:
name: rxdart
sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
url: "https://pub.dev"
source: hosted
version: "0.27.7"
version: "0.28.0"
screen_retriever:
dependency: transitive
description:
Expand Down Expand Up @@ -1401,10 +1414,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev"
source: hosted
version: "0.7.0"
version: "0.7.2"
timezone:
dependency: transitive
description:
Expand Down Expand Up @@ -1577,10 +1590,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev"
source: hosted
version: "14.2.1"
version: "14.2.5"
wakelock_plus:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies:
vector_graphics: any

dev_dependencies:
custom_lint: ^0.6.4
custom_lint: ^0.6.5
neon_lints:
git:
url: https://github.com/nextcloud/neon
Expand Down
2 changes: 2 additions & 0 deletions packages/neon_framework/lib/l10n/localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;

import 'localizations_en.dart';

// ignore_for_file: type=lint

/// Callers can lookup localized strings with an instance of NeonLocalizations
/// returned by `NeonLocalizations.of(context)`.
///
Expand Down
2 changes: 2 additions & 0 deletions packages/neon_framework/lib/l10n/localizations_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import 'package:intl/intl.dart' as intl;

import 'localizations.dart';

// ignore_for_file: type=lint

/// The translations for English (`en`).
class NeonLocalizationsEn extends NeonLocalizations {
NeonLocalizationsEn([String locale = 'en']) : super(locale);
Expand Down
3 changes: 1 addition & 2 deletions packages/neon_framework/lib/src/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:convert';

import 'package:built_collection/built_collection.dart';
import 'package:collection/collection.dart';
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flutter/material.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
Expand Down Expand Up @@ -219,7 +218,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, WindowLi
deviceThemeLight: deviceThemeLight,
deviceThemeDark: deviceThemeDark,
oledAsDark: options.themeOLEDAsDark.value,
appThemes: _appImplementations.map((a) => a.theme).whereNotNull(),
appThemes: _appImplementations.map((a) => a.theme).nonNulls,
neonTheme: widget.neonTheme,
);

Expand Down
14 changes: 9 additions & 5 deletions packages/neon_framework/lib/src/pages/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,18 @@ class _HomePageState extends State<HomePage> {
});

maintenanceModeErrorsSubscription = maintenanceModeBloc.errors.listen((error) {
NeonError.showSnackbar(context, error);
if (mounted) {
NeonError.showSnackbar(context, error);
}
});

maintenanceModeSubscription = maintenanceModeBloc.onMaintenanceMode.listen((_) async {
await showErrorDialog(
context: context,
message: NeonLocalizations.of(context).errorServerInMaintenanceMode,
);
if (mounted) {
await showErrorDialog(
context: context,
message: NeonLocalizations.of(context).errorServerInMaintenanceMode,
);
}
});

GlobalPopups().register(context);
Expand Down
12 changes: 7 additions & 5 deletions packages/neon_framework/lib/src/pages/login_flow.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ class _LoginFlowPageState extends State<LoginFlowPage> {
});

resultSubscription = bloc.result.listen((result) async {
await LoginCheckAccountRoute(
serverUrl: Uri.parse(result.server),
loginName: result.loginName,
password: result.appPassword,
).push<LoginCheckAccountRoute>(context);
if (mounted) {
await LoginCheckAccountRoute(
serverUrl: Uri.parse(result.server),
loginName: result.loginName,
password: result.appPassword,
).push<LoginCheckAccountRoute>(context);
}
});
}

Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/lib/src/utils/global_options.dart
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class GlobalOptions extends OptionsCollection {
/// Defaults to `false`.
///
/// See:
/// * [minimizeInsteadOfExit]: for an option to minimize instead of closing the app.
/// * [startupMinimizeInsteadOfExit]: for an option to minimize instead of closing the app.
late final startupMinimized = ToggleOption(
storage: storage,
key: GlobalOptionKeys.startupMinimized,
Expand Down
4 changes: 2 additions & 2 deletions packages/neon_framework/lib/src/widgets/drawer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ class _NeonDrawerState extends State<NeonDrawer> {

/// Custom styled [DrawerHeader] used inside a [Drawer] or [NeonDrawer].
///
/// The neon drawer will display the [core.ThemingPublicCapabilities_Theming.name]
/// and [core.ThemingPublicCapabilities_Theming.logo] and automatically rebuild
/// The neon drawer will display the [core.$ThemingPublicCapabilities_ThemingInterface.name]
/// and [core.$ThemingPublicCapabilities_ThemingInterface.logo] and automatically rebuild
/// when the current theme changes.
@internal
class NeonDrawerHeader extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
url: https://github.com/nextcloud/neon
path: packages/neon_framework/packages/neon_http_client
nextcloud: ^7.0.0
rxdart: ^0.27.0
rxdart: ^0.28.0

dev_dependencies:
build_runner: ^2.4.11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;

import 'localizations_en.dart';

// ignore_for_file: type=lint

/// Callers can lookup localized strings with an instance of DashboardLocalizations
/// returned by `DashboardLocalizations.of(context)`.
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import 'package:intl/intl.dart' as intl;

import 'localizations.dart';

// ignore_for_file: type=lint

/// The translations for English (`en`).
class DashboardLocalizationsEn extends DashboardLocalizations {
DashboardLocalizationsEn([String locale = 'en']) : super(locale);
Expand Down
4 changes: 2 additions & 2 deletions packages/neon_framework/packages/dashboard_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ dependencies:
url: https://github.com/nextcloud/neon
path: packages/neon_framework
nextcloud: ^7.0.0
rxdart: ^0.27.0
rxdart: ^0.28.0

dev_dependencies:
build_runner: ^2.4.11
custom_lint: ^0.6.4
custom_lint: ^0.6.5
flutter_test:
sdk: flutter
go_router_builder: ^2.7.1
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;

import 'localizations_en.dart';

// ignore_for_file: type=lint

/// Callers can lookup localized strings with an instance of FilesLocalizations
/// returned by `FilesLocalizations.of(context)`.
///
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'localizations.dart';

// ignore_for_file: type=lint

/// The translations for English (`en`).
class FilesLocalizationsEn extends FilesLocalizations {
FilesLocalizationsEn([String locale = 'en']) : super(locale);
Expand Down
Loading