From 0351c768c4524fd33b57370482e6232481fe184a Mon Sep 17 00:00:00 2001 From: Yuri Petrov <48598325+petrovyuri@users.noreply.github.com> Date: Wed, 8 Oct 2025 15:14:02 +0300 Subject: [PATCH] =?UTF-8?q?chore(pubspec):=20FLUTTER-151=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20flutter=20?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20(#33)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependencies and SDK versions in pubspec.yaml and related files * chore(readme): update Readme --------- Co-authored-by: petrovyuri --- .vscode/tasks.json | 10 ++ LICENSE | 2 +- README.md | 13 +- app_services/base/app_services/pubspec.yaml | 4 +- l10n.yaml | 3 +- lib/app/app_config/app_config.g.dart | 148 ++++++++++---------- lib/gen/assets.gen.dart | 6 +- pubspec.lock | 128 ++++++++++++----- pubspec.yaml | 26 ++-- 9 files changed, 204 insertions(+), 136 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2ac83af..b0fc062 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -62,6 +62,16 @@ "type": "shell", "command": "./tools/switch_service.sh aurora", "problemMatcher": [] + }, + { + "label": "flutter gen-l10n", + "type": "shell", + "command": "flutter", + "args": [ + "gen-l10n" + ], + "group": "build", + "problemMatcher": [], } ] } \ No newline at end of file diff --git a/LICENSE b/LICENSE index 781356d..b04a0a3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -"Copyright (c) 2025 Friflex LLC" +Copyright (c) 2025 Friflex LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 6966935..64f7d4b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # 🚀 Friflex Flutter Starter - Корпоративный шаблон -![Flutter](https://img.shields.io/badge/Flutter-3.32.0+-02569B?style=for-the-badge&logo=flutter&logoColor=white) -![Dart](https://img.shields.io/badge/Dart-3.8.0+-0175C2?style=for-the-badge&logo=dart&logoColor=white) -![Version](https://img.shields.io/badge/Version-v0.0.1-green?style=for-the-badge) +![Flutter](https://img.shields.io/badge/Flutter-3.35.5+-02569B?style=for-the-badge&logo=flutter&logoColor=white) +![Dart](https://img.shields.io/badge/Dart-3.9.2+-0175C2?style=for-the-badge&logo=dart&logoColor=white) ![License](https://img.shields.io/badge/License-MIT-blue?style=for-the-badge) Корпоративный стартовый шаблон для разработки масштабируемых Flutter-приложений @@ -91,13 +90,13 @@ features/ | Категория | Библиотека | Версия | Описание | |-----------|------------|--------|----------| -| 🧭 **Навигация** | [go_router](https://pub.dev/packages/go_router) | `15.1.2` | Декларативный роутинг | +| 🧭 **Навигация** | [go_router](https://pub.dev/packages/go_router) | `16.2.4` | Декларативный роутинг | | 🔄 **State Management** | [flutter_bloc](https://pub.dev/packages/flutter_bloc) | `9.1.1` | Управление состоянием | | 💉 **DI** | Custom InheritedWidget | - | Внедрение зависимостей | -| 🎨 **Resources** | [flutter_gen](https://pub.dev/packages/flutter_gen) | `5.10.0` | Генерация ресурсов | -| 🌐 **HTTP** | [dio](https://pub.dev/packages/dio) | `5.8.0+1` | HTTP клиент | +| 🎨 **Resources** | [flutter_gen](https://pub.dev/packages/flutter_gen) | `5.12.0` | Генерация ресурсов | +| 🌐 **HTTP** | [dio](https://pub.dev/packages/dio) | `5.9.0` | HTTP клиент | | 🔒 **Secure Storage** | [flutter_secure_storage](https://pub.dev/packages/flutter_secure_storage) | - | Защищенное хранилище | -| 📊 **Logging** | [talker](https://pub.dev/packages/talker_flutter) | `4.8.0` | Логирование и отладка | +| 📊 **Logging** | [talker](https://pub.dev/packages/talker_flutter) | `5.0.1` | Логирование и отладка | ### 🔧 Инструменты разработки diff --git a/app_services/base/app_services/pubspec.yaml b/app_services/base/app_services/pubspec.yaml index d4fe00f..7073a30 100644 --- a/app_services/base/app_services/pubspec.yaml +++ b/app_services/base/app_services/pubspec.yaml @@ -14,13 +14,13 @@ dependencies: flutter_secure_storage: 9.2.4 # Зависимости для сервиса незащищенного хранилища - shared_preferences: 2.3.5 + shared_preferences: 2.5.3 # для работы с путями в хранилища path_provider: 2.1.5 # Работа с геолокацией - geolocator: 14.0.1 + geolocator: 14.0.2 # Обязательные интерфейсы i_app_services: diff --git a/l10n.yaml b/l10n.yaml index c6e3a25..7b5cebd 100644 --- a/l10n.yaml +++ b/l10n.yaml @@ -1,5 +1,4 @@ arb-dir: lib/l10n template-arb-file: app_en.arb output-dir: lib/l10n/gen -output-localization-file: app_localizations.dart -synthetic-package: false \ No newline at end of file +output-localization-file: app_localizations.dart \ No newline at end of file diff --git a/lib/app/app_config/app_config.g.dart b/lib/app/app_config/app_config.g.dart index 4d451c4..ad20e54 100644 --- a/lib/app/app_config/app_config.g.dart +++ b/lib/app/app_config/app_config.g.dart @@ -13,15 +13,15 @@ final class _Dev { static const String baseUrl = 'https://dev'; static const List _enviedkeysecretKey = [ - 1799992456, - 3121235721, - 1896517115, + 1250675737, + 1700106436, + 3701613773, ]; static const List _envieddatasecretKey = [ - 1799992556, - 3121235820, - 1896517005, + 1250675837, + 1700106401, + 3701613755, ]; static final String secretKey = String.fromCharCodes( @@ -38,33 +38,33 @@ final class _Dev { // generated_from: env/prod.env final class _Prod { static const List _enviedkeybaseUrl = [ - 1627073061, - 1329144317, - 4010373711, - 41847181, - 869222509, - 509998400, - 1912743375, - 3591333682, - 1441008454, - 2168353742, - 3600711694, - 2824342757, + 2313418965, + 1278864221, + 2117667009, + 1514310825, + 996679495, + 1388625655, + 2368060187, + 1047428716, + 502950869, + 2499923893, + 963407594, + 1679400929, ]; static const List _envieddatabaseUrl = [ - 1627073101, - 1329144201, - 4010373691, - 41847293, - 869222430, - 509998458, - 1912743392, - 3591333661, - 1441008438, - 2168353724, - 3600711777, - 2824342657, + 2313418941, + 1278864169, + 2117666997, + 1514310873, + 996679476, + 1388625613, + 2368060212, + 1047428675, + 502950821, + 2499923911, + 963407493, + 1679400837, ]; static final String baseUrl = String.fromCharCodes( @@ -76,17 +76,17 @@ final class _Prod { ); static const List _enviedkeysecretKey = [ - 491371727, - 838972038, - 2580624111, - 1889389419, + 1650398676, + 1481444979, + 21401329, + 1103991377, ]; static const List _envieddatasecretKey = [ - 491371711, - 838972148, - 2580624000, - 1889389327, + 1650398628, + 1481444865, + 21401246, + 1103991349, ]; static final String secretKey = String.fromCharCodes( @@ -103,35 +103,35 @@ final class _Prod { // generated_from: env/stage.env final class _Stage { static const List _enviedkeybaseUrl = [ - 585835488, - 3326410961, - 3188945183, - 460492541, - 1928378853, - 1675035574, - 2754976633, - 2459126129, - 3745790828, - 3098981050, - 99445498, - 3535573105, - 3875375463, + 1623636460, + 1720327728, + 1318998227, + 1880230818, + 1752001284, + 726589281, + 1688681936, + 2751223200, + 1403987498, + 1289212622, + 1492662645, + 2947900480, + 809806156, ]; static const List _envieddatabaseUrl = [ - 585835400, - 3326410917, - 3188945259, - 460492429, - 1928378774, - 1675035532, - 2754976598, - 2459126110, - 3745790751, - 3098981070, - 99445403, - 3535573014, - 3875375362, + 1623636356, + 1720327748, + 1318998183, + 1880230866, + 1752001399, + 726589275, + 1688681983, + 2751223183, + 1403987545, + 1289212602, + 1492662548, + 2947900455, + 809806121, ]; static final String baseUrl = String.fromCharCodes( @@ -143,19 +143,19 @@ final class _Stage { ); static const List _enviedkeysecretKey = [ - 986583346, - 12639897, - 2122410836, - 1036379862, - 1792372112, + 5890476, + 3047051242, + 2874959210, + 758075519, + 3738110555, ]; static const List _envieddatasecretKey = [ - 986583361, - 12639981, - 2122410805, - 1036379825, - 1792372213, + 5890527, + 3047051166, + 2874959115, + 758075416, + 3738110526, ]; static final String secretKey = String.fromCharCodes( diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 877bf67..a07182c 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -67,6 +69,7 @@ class SvgGenImage { String? semanticsLabel, bool excludeFromSemantics = false, _svg.SvgTheme? theme, + _svg.ColorMapper? colorMapper, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @@ -86,6 +89,7 @@ class SvgGenImage { assetBundle: bundle, packageName: package, theme: theme, + colorMapper: colorMapper, ); } return _svg.SvgPicture( diff --git a/pubspec.lock b/pubspec.lock index fdf26d6..a4858e4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -232,14 +232,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + dbus: + dependency: transitive + description: + name: dbus + sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" + url: "https://pub.dev" + source: hosted + version: "0.7.11" dio: dependency: "direct main" description: name: dio - sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9" + sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9 url: "https://pub.dev" source: hosted - version: "5.8.0+1" + version: "5.9.0" dio_web_adapter: dependency: transitive description: @@ -252,10 +260,10 @@ packages: dependency: "direct main" description: name: envied - sha256: a4e2b1d0caa479b5d61332ae516518c175a6d09328a35a0bc0a53894cc5d7e4d + sha256: "3c7fdf77ffd99bb429d8373b5f1eec3153c2871347f140d107895fd52b6e2c66" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.3.0" envied_generator: dependency: "direct dev" description: @@ -321,26 +329,26 @@ packages: dependency: "direct dev" description: name: flutter_gen - sha256: "4117a3ea6b26a910c715bd58abcc5a90447e70930a5b98249e94c41da9e849bb" + sha256: eac4863b65813aacbf16ecc07e7c271ab82fb2d95181825348f1fb7b03fd52da url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.12.0" flutter_gen_core: dependency: transitive description: name: flutter_gen_core - sha256: "3eaa2d3d8be58267ac4cd5e215ac965dd23cae0410dc073de2e82e227be32bfc" + sha256: b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311 url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.12.0" flutter_gen_runner: dependency: "direct dev" description: name: flutter_gen_runner - sha256: e74b4ead01df3e8f02e73a26ca856759dbbe8cb3fd60941ba9f4005cd0cd19c9 + sha256: c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29 url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.12.0" flutter_lints: dependency: "direct dev" description: @@ -406,10 +414,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1 + sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.1" flutter_test: dependency: "direct dev" description: flutter @@ -428,14 +436,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + geoclue: + dependency: transitive + description: + name: geoclue + sha256: c2a998c77474fc57aa00c6baa2928e58f4b267649057a1c76738656e9dbd2a7f + url: "https://pub.dev" + source: hosted + version: "0.1.1" geolocator: dependency: transitive description: name: geolocator - sha256: ee2212a3df8292ec4c90b91183b8001d3f5a800823c974b570c5f9344ca320dc + sha256: "79939537046c9025be47ec645f35c8090ecadb6fe98eba146a0d25e8c1357516" url: "https://pub.dev" source: hosted - version: "14.0.1" + version: "14.0.2" geolocator_android: dependency: transitive description: @@ -452,6 +468,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.13" + geolocator_linux: + dependency: transitive + description: + name: geolocator_linux + sha256: c4e966f0a7a87e70049eac7a2617f9e16fd4c585a26e4330bdfc3a71e6a721f3 + url: "https://pub.dev" + source: hosted + version: "0.2.3" geolocator_platform_interface: dependency: transitive description: @@ -488,10 +512,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a" + sha256: c752e2d08d088bf83742cb05bf83003f3e9d276ff1519b5c92f9d5e60e5ddd23 url: "https://pub.dev" source: hosted - version: "15.1.2" + version: "16.2.4" graphs: dependency: transitive description: @@ -508,6 +532,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.3.4" + gsettings: + dependency: transitive + description: + name: gsettings + sha256: "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c" + url: "https://pub.dev" + source: hosted + version: "0.2.8" hashcodes: dependency: transitive description: @@ -547,6 +579,14 @@ packages: relative: true source: path version: "0.0.1" + image: + dependency: transitive + description: + name: image + sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928" + url: "https://pub.dev" + source: hosted + version: "4.5.4" image_size_getter: dependency: transitive description: @@ -631,10 +671,10 @@ packages: dependency: "direct main" description: name: lottie - sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 + sha256: "8ae0be46dbd9e19641791dc12ee480d34e1fd3f84c749adc05f3ad9342b71b95" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.3.2" matcher: dependency: transitive description: @@ -683,6 +723,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + package_info_plus: + dependency: transitive + description: + name: package_info_plus + sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968" + url: "https://pub.dev" + source: hosted + version: "8.3.1" + package_info_plus_platform_interface: + dependency: transitive + description: + name: package_info_plus_platform_interface + sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086" + url: "https://pub.dev" + source: hosted + version: "3.2.1" path: dependency: transitive description: @@ -823,26 +879,26 @@ packages: dependency: transitive description: name: share_plus - sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da + sha256: "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6" url: "https://pub.dev" source: hosted - version: "10.1.4" + version: "12.0.0" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b + sha256: "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a" url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "6.1.0" shared_preferences: dependency: transitive description: name: shared_preferences - sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a + sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.3" shared_preferences_android: dependency: transitive description: @@ -980,42 +1036,42 @@ packages: dependency: transitive description: name: talker - sha256: a664f5eae5284e94aa8c535e0400ab71a78fa2480ad18a7344dec928b5c56805 + sha256: f86b1de9e2442228c9340b418703b4ee10d0f831bf3571696ba1d835293ad22a url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "5.0.1" talker_bloc_logger: dependency: "direct main" description: name: talker_bloc_logger - sha256: "1af998d6cbafba00f66bbf49d77132275d3b113c6ac53ce0dc9d9981206f9cea" + sha256: "8707878d8213f1441ea24ae2d5e4c0673eb4e5b58ac8e61fc24850ca9915c287" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "5.0.1" talker_dio_logger: dependency: "direct main" description: name: talker_dio_logger - sha256: "296a20ce600ccca7801deb5a530c28d03500c520f25f1e40c3bae727f63dd5eb" + sha256: "35699be0353164916db4e6cfdeae390da53b5b1e364ee78fc0ef4c1c46cd3f46" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "5.0.1" talker_flutter: dependency: "direct main" description: name: talker_flutter - sha256: "480c51bba7ac0dcab23be5e9545214a43179625bc5f787326248e94af8316aee" + sha256: "4e5614548cd4f2a979ec6a63d455dc12e254e49989d67e95b89003d1893cc21c" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "5.0.1" talker_logger: dependency: "direct main" description: name: talker_logger - sha256: b5d0bd04229eeccdf765cabf73e964ee28528c749104b56867c8d2eb764a45ee + sha256: "8c63990d33e779a24368e0c191e6c9a54639088b6fe3a5b763a6f37fe00ff20b" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "5.0.1" term_glyph: dependency: transitive description: @@ -1217,5 +1273,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.8.0 <4.0.0" - flutter: ">=3.32.0" + dart: ">=3.9.2 <4.0.0" + flutter: ">=3.35.5" diff --git a/pubspec.yaml b/pubspec.yaml index 7501aa6..a6139b0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,29 +6,29 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 0.0.1+1 environment: - sdk: ^3.8.0 - flutter: ">=3.32.0" + sdk: ^3.9.2 + flutter: ">=3.35.5" dependencies: flutter: sdk: flutter cupertino_icons: 1.0.8 - envied: 1.1.1 - go_router: 15.1.2 + envied: 1.3.0 + go_router: 16.2.4 flutter_bloc: 9.1.1 provider: 6.1.5 - dio: 5.8.0+1 + dio: 5.9.0 intl: 0.20.2 - flutter_svg: 2.1.0 + flutter_svg: 2.2.1 flutter_localizations: sdk: flutter - lottie: 3.3.1 + lottie: 3.3.2 # Пакеты для отладки - talker_flutter: 4.8.0 - talker_dio_logger: 4.8.0 - talker_bloc_logger: 4.8.0 - talker_logger: 4.8.0 + talker_flutter: 5.0.1 + talker_dio_logger: 5.0.1 + talker_bloc_logger: 5.0.1 + talker_logger: 5.0.1 equatable: 2.0.7 @@ -51,8 +51,8 @@ dev_dependencies: sdk: flutter envied_generator: 1.1.1 build_runner: 2.4.15 - flutter_gen_runner: 5.10.0 - flutter_gen: 5.10.0 + flutter_gen_runner: 5.12.0 + flutter_gen: 5.12.0 flutter_lints: 6.0.0 theme_tailor: 3.0.3