diff --git a/.cspell.yaml b/.cspell.yaml index f7b2d66a..c50e7cfc 100644 --- a/.cspell.yaml +++ b/.cspell.yaml @@ -12,7 +12,6 @@ ignorePaths: - "**/test" - "**/web" - "**/windows" - - "*.freezed.dart" - "*.g.dart" - "*.gen.dart" - "*.lock" diff --git a/.fvmrc b/.fvmrc index f6203263..bd157de4 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.38.5" + "flutter": "3.38.7" } \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4d57e6d8..d284ed4c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,13 +18,6 @@ updates: riverpod-dependencies: patterns: - "*riverpod*" - - "build_runner" - freezed-dependencies: - patterns: - - "build_runner" - - "freezed*" - - "json_annotation" - - "json_serializable" slang-dependencies: patterns: - "build_runner" diff --git a/.vscode/freezed.code-snippets b/.vscode/freezed.code-snippets deleted file mode 100644 index 68182f1b..00000000 --- a/.vscode/freezed.code-snippets +++ /dev/null @@ -1,49 +0,0 @@ -{ - "freezed": { - "prefix": "freezed", - "body": [ - "// ignore: unused_import", - "import 'package:flutter/foundation.dart';", - "import 'package:freezed_annotation/freezed_annotation.dart';", - "", - "part '$1.freezed.dart';", - "part '$1.g.dart';", - "", - "@freezed", - "abstract class $2 with _$$2 {", - " const factory $2({", - " /// FIXME: implementation", - " required String userId,", - " }) = _$2;", - "", - " factory $2.fromJson(Map json) =>", - " _$$2FromJson(json);", - "}" - ], - }, - "freezed from this file name": { - "prefix": "freezedFromThisFileName", - "body": [ - "// ignore: unused_import", - "import 'package:flutter/foundation.dart';", - "import 'package:freezed_annotation/freezed_annotation.dart';", - "", - "import '../json_converter/json_converter.dart';", - "", - "part '${TM_FILENAME_BASE}.freezed.dart';", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@freezed", - "abstract class ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/} with _$${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/} {", - " @jsonConvertersSerializable", - " const factory ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/}({", - " /// FIXME: implementation", - " required String userId,", - " }) = _${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/};", - "", - " factory ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/}.fromJson(Map json) =>", - " _$${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/}FromJson(json);", - "}" - ], - }, -} \ No newline at end of file diff --git a/.vscode/riverpod.code-snippets b/.vscode/riverpod.code-snippets deleted file mode 100644 index 3cd3f2bf..00000000 --- a/.vscode/riverpod.code-snippets +++ /dev/null @@ -1,145 +0,0 @@ -{ - "Riverpod and simple class": { - "prefix": "riverpodAndSimpleClass", - "body": [ - "import 'package:hooks_riverpod/hooks_riverpod.dart';", - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@Riverpod(keepAlive: true)", - "${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/} ${TM_FILENAME_BASE/(.*)/${1:/camellcase}${2}/}(${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/}Ref ref) =>", - " ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/}(ref);", - "", - "class ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/} {", - " const ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}${2}/}(this.ref);", - "", - " final Ref ref;", - "", - " Future call() async {", - " // TODO: implementation", - " }", - "}", - ], - }, - "Riverpod from Method": { - "prefix": "riverpodMethod", - "body": [ - "import 'package:hooks_riverpod/hooks_riverpod.dart';", - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@riverpod", - "$1 $2(Ref ref) {", - " return ${3:value};", - "}", - ], - }, - "Riverpod from Method with keepAlive": { - "prefix": "riverpodMethodKeepAlive", - "body": [ - "import 'package:hooks_riverpod/hooks_riverpod.dart';", - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@Riverpod(keepAlive: true)", - "$1 $2(Ref ref) {", - " return ${3:value};", - "}", - ], - }, - "Riverpod from Future method": { - "prefix": "riverpodFutureMethod", - "body": [ - "import 'package:hooks_riverpod/hooks_riverpod.dart';", - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@riverpod", - "Future<$1> $2(Ref ref) async {", - " return ${3:value};", - "}", - ], - }, - "Riverpod from Future method with keepAlive": { - "prefix": "riverpodFutureMethodKeepAlive", - "body": [ - "import 'package:hooks_riverpod/hooks_riverpod.dart';", - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@Riverpod(keepAlive: true)", - "Future<$1> $2(Ref ref) async {", - " return ${3:value};", - "}", - ], - }, - "Riverpod NotifierProvider": { - "prefix": "riverpodNotifierProvider", - "body": [ - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@riverpod", - "class $1 extends _$$1 {", - " @override", - " ${2:return type} build() {", - " return ${3:value};", - " }", - "}", - ], - }, - "Riverpod NotifierProvider with keepAlive": { - "prefix": "riverpodNotifierProviderKeepAlive", - "body": [ - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@Riverpod(keepAlive: true)", - "class $1 extends _$$1 {", - " @override", - " ${2:return type} build() {", - " return ${3:value};", - " }", - "}", - ], - }, - "Riverpod AsyncNotifierProvider": { - "prefix": "riverpodAsyncNotifierProvider", - "body": [ - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@riverpod", - "class $1 extends _$$1 {", - " @override", - " FutureOr<${2:return type}> build() async {", - " return ${3:value};", - " }", - "}", - ], - }, - "Riverpod AsyncNotifierProvider with keepAlive": { - "prefix": "riverpodAsyncNotifierProviderKeepAlive", - "body": [ - "import 'package:riverpod_annotation/riverpod_annotation.dart';", - "", - "part '${TM_FILENAME_BASE}.g.dart';", - "", - "@Riverpod(keepAlive: true)", - "class $1 extends _$$1 {", - " @override", - " FutureOr<${2:return type}> build() async {", - " return ${3:value};", - " }", - "}", - ], - }, -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 9c0b1cbf..b65b8a2b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,7 +16,7 @@ } }, "dart.flutterGenerateLocalizationsOnSave": "all", - "dart.flutterSdkPath": ".fvm/versions/3.38.5", + "dart.flutterSdkPath": ".fvm/versions/3.38.7", "dart.debugExternalPackageLibraries": false, "dart.debugSdkLibraries": false, "dart.experimentalRefactors": true, @@ -44,7 +44,7 @@ ".env.sample": ".env*", ".gitignore": ".gitattributes, .gitmodules, .gitmessage, .mailmap, .git-blame*", "readme.*": "authors, backers.md, changelog*, citation*, code_of_conduct.md, codeowners, contributing.md, contributors, copying, credits, governance.md, history.md, license*, maintainers, readme*, security.md, sponsors.md", - "*.dart": "$(capture).g.dart, $(capture).freezed.dart, $(capture).mocks.dart" + "*.dart": "$(capture).g.dart, $(capture).mocks.dart" }, "files.associations": { "*.apns": "json" @@ -57,7 +57,6 @@ "git.enableSmartCommit": true, "search.exclude": { "**/*.dart_tool": true, - "**/*.freezed.dart": true, "**/*.g.dart": true, "**/*.log": true, "**/*.symlinks": true, diff --git a/codecov.yml b/codecov.yml index 6343c43f..470e0c09 100644 --- a/codecov.yml +++ b/codecov.yml @@ -35,7 +35,6 @@ parsers: ignore: - "**/gen/**" - "**/stub/**" - - "**/*.freezed.dart" - "**/*.g.dart" comment: # See: https://docs.codecov.io/docs/pull-request-comments @@ -49,7 +48,6 @@ component_management: - "packages/*/lib/**" - "!**/stub/**" - "!**/gen/**" - - "!**/*.freezed.dart" - "!**/*.g.dart" individual_components: - component_id: flutter_app diff --git a/mason-lock.json b/mason-lock.json deleted file mode 100644 index b8f7ec61..00000000 --- a/mason-lock.json +++ /dev/null @@ -1 +0,0 @@ -{"bricks":{"page":"1.3.0"}} \ No newline at end of file diff --git a/mason.yaml b/mason.yaml deleted file mode 100644 index 5a4ff80d..00000000 --- a/mason.yaml +++ /dev/null @@ -1,2 +0,0 @@ -bricks: - page: ^1.1.2 diff --git a/packages/convenient_widgets/pubspec.yaml b/packages/convenient_widgets/pubspec.yaml index e6caf9ef..8e93787a 100644 --- a/packages/convenient_widgets/pubspec.yaml +++ b/packages/convenient_widgets/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.0.0 environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/core/authenticator/pubspec.yaml b/packages/core/authenticator/pubspec.yaml index 2118190e..9101e7b6 100644 --- a/packages/core/authenticator/pubspec.yaml +++ b/packages/core/authenticator/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 resolution: workspace environment: - sdk: ^3.10.4 + sdk: ^3.10.7 dependencies: collection: ^1.18.0 diff --git a/packages/core/configurator/pubspec.yaml b/packages/core/configurator/pubspec.yaml index 9fd175be..58a70fc7 100644 --- a/packages/core/configurator/pubspec.yaml +++ b/packages/core/configurator/pubspec.yaml @@ -8,7 +8,7 @@ false_secrets: - example/** environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/core/messenger/pubspec.yaml b/packages/core/messenger/pubspec.yaml index 13274d55..8a044063 100644 --- a/packages/core/messenger/pubspec.yaml +++ b/packages/core/messenger/pubspec.yaml @@ -9,7 +9,7 @@ false_secrets: - example/** environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/core/tracker/pubspec.yaml b/packages/core/tracker/pubspec.yaml index a83506d5..5f8f42c1 100644 --- a/packages/core/tracker/pubspec.yaml +++ b/packages/core/tracker/pubspec.yaml @@ -9,7 +9,7 @@ false_secrets: - example/** environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/core/utils/pubspec.yaml b/packages/core/utils/pubspec.yaml index 3ea32e1d..c7f228c7 100644 --- a/packages/core/utils/pubspec.yaml +++ b/packages/core/utils/pubspec.yaml @@ -5,7 +5,7 @@ version: 1.0.0 homepage: environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/flutter_app/README.md b/packages/flutter_app/README.md index aadc8525..803de068 100644 --- a/packages/flutter_app/README.md +++ b/packages/flutter_app/README.md @@ -26,7 +26,7 @@ - [Riverpod](https://riverpod.dev/) ### Code Generation -- [freezed](https://pub.dev/packages/freezed) +- [build_runner](https://pub.dev/packages/build_runner) - [json_serializable](https://pub.dev/packages/json_serializable) ### Hooks diff --git a/packages/flutter_app/pubspec.yaml b/packages/flutter_app/pubspec.yaml index b4d5a2c2..49e09051 100644 --- a/packages/flutter_app/pubspec.yaml +++ b/packages/flutter_app/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 1.0.0+32 environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/pub_dev_api_client/pubspec.yaml b/packages/pub_dev_api_client/pubspec.yaml index 5f6590ec..78afe9f7 100644 --- a/packages/pub_dev_api_client/pubspec.yaml +++ b/packages/pub_dev_api_client/pubspec.yaml @@ -3,7 +3,7 @@ description: Pub.dev API client package version: 1.0.0 environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/themes/pubspec.yaml b/packages/themes/pubspec.yaml index 9d7292aa..361fbf2f 100644 --- a/packages/themes/pubspec.yaml +++ b/packages/themes/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: "none" environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/util/pubspec.yaml b/packages/util/pubspec.yaml index 633cd201..5733fb02 100644 --- a/packages/util/pubspec.yaml +++ b/packages/util/pubspec.yaml @@ -6,7 +6,7 @@ version: 1.0.0 homepage: https://github.com/altive/flutter_app_template/tree/main/packages/util environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/packages/widget_catalog/pubspec.yaml b/packages/widget_catalog/pubspec.yaml index b3d18be1..4d80c661 100644 --- a/packages/widget_catalog/pubspec.yaml +++ b/packages/widget_catalog/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.0.0 environment: - sdk: ^3.10.4 + sdk: ^3.10.7 resolution: workspace diff --git a/pubspec.lock b/pubspec.lock index 2a53187f..4aad3be1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1947,5 +1947,5 @@ packages: source: hosted version: "2.2.2" sdks: - dart: ">=3.10.4 <4.0.0" + dart: ">=3.10.7 <4.0.0" flutter: ">=3.35.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2373d422..7b39a4b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ name: flutter_app_template_workspace publish_to: none environment: - sdk: ^3.10.4 + sdk: ^3.10.7 workspace: - packages/convenient_widgets @@ -34,7 +34,7 @@ melos: command: bootstrap: environment: - sdk: ^3.10.4 + sdk: ^3.10.7 dev_dependencies: altive_lints: ^2.1.0 version: @@ -47,7 +47,7 @@ melos: format:ci: run: | melos exec -- \ - dart format --set-exit-if-changed $(find . -name "*.dart" -not \( -name "*.*freezed.dart" -o -name "*.*g.dart" -o -name "*.gen.dart" -o -wholename "./.dart_tool/*" \) ) + dart format --set-exit-if-changed $(find . -name "*.dart" -not \( -name "*.*g.dart" -o -name "*.gen.dart" -o -wholename "./.dart_tool/*" \) ) description: Run format. packageFilters: flutter: true