Skip to content

Commit

Permalink
Merge pull request #227 from netglade/feat/packages_upgrade
Browse files Browse the repository at this point in the history
Feat/packages upgrade
  • Loading branch information
tenhobi authored Jan 23, 2025
2 parents b00ad8f + bd61091 commit 579e160
Show file tree
Hide file tree
Showing 53 changed files with 554 additions and 317 deletions.
3 changes: 3 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.27.1"
}
14 changes: 6 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,18 @@ jobs:
run: melos run lint:dart

- name: Install DCM
uses: CQLabs/setup-dcm@v1
uses: CQLabs/setup-dcm@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run DCM
uses: CQLabs/dcm-action@v1
uses: CQLabs/dcm-action@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
ci_key: oss
github-token: ${{ secrets.GITHUB_TOKEN }}
ci-key: oss
email: oss
folders: .
fatal_style: true
fatal_performance: true
fatal_warnings: true
fatal-found: true

- name: Test
run: melos run test
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ build/
.settings
.last_build_id
*.iml

# FVM Version Cache
.fvm/
25 changes: 24 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
{
"yaml.schemaStore.enable": false
"yaml.schemaStore.enable": false,
"dart.flutterSdkPath": ".fvm/versions/3.27.1",
"search.exclude": {
"**/.fvm": true
},
"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
".idea/**": true,
".run/**": true
},
"files.watcherExclude": {
"**/.fvm": true
},
"[dart]": {
"editor.formatOnSave": true,
"editor.formatOnType": true,
"editor.rulers": [
120
],
"editor.formatOnPaste": true,
"editor.defaultFormatter": "Dart-Code.dart-code"
},
"dart.lineLength": 120
}
13 changes: 7 additions & 6 deletions examples/drift/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=2.18.7 <4.0.0"
sdk: ^3.6.0
resolution: workspace

dependencies:
auto_mappr_annotation: ^2.0.0
auto_mappr_annotation: ^2.3.0
drift: ^2.7.0
equatable: ^2.0.5
equatable: ^2.0.7

dev_dependencies:
auto_mappr: ^2.0.0
auto_mappr: ^2.6.0
build_runner: ^2.0.0
drift_dev: ^2.7.0
netglade_analysis: ^8.0.0
test: ^1.16.0
netglade_analysis: ^15.0.0
test: ^1.25.8
13 changes: 7 additions & 6 deletions examples/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=2.18.7 <4.0.0"
sdk: ^3.6.0
resolution: workspace

dependencies:
auto_mappr_annotation: ^2.0.0
equatable: ^2.0.5
auto_mappr_annotation: ^2.3.0
equatable: ^2.0.7

dev_dependencies:
auto_mappr: ^2.0.0
auto_mappr: ^2.6.0
build_runner: ^2.0.0
netglade_analysis: ^8.0.0
test: ^1.16.0
netglade_analysis: ^15.0.0
test: ^1.25.8
17 changes: 14 additions & 3 deletions examples/freezed/lib/freezed_example.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ mixin _$UserInfoUnion {
DateTime get updatedAt => throw _privateConstructorUsedError;
int get primarySectionId => throw _privateConstructorUsedError;

@JsonKey(ignore: true)
/// Create a copy of UserInfoUnion
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
$UserInfoUnionCopyWith<UserInfoUnion> get copyWith =>
throw _privateConstructorUsedError;
}
Expand Down Expand Up @@ -49,6 +51,8 @@ class _$UserInfoUnionCopyWithImpl<$Res, $Val extends UserInfoUnion>
// ignore: unused_field
final $Res Function($Val) _then;

/// Create a copy of UserInfoUnion
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({
Expand Down Expand Up @@ -101,6 +105,8 @@ class __$$UserInfoImplCopyWithImpl<$Res>
_$UserInfoImpl _value, $Res Function(_$UserInfoImpl) _then)
: super(_value, _then);

/// Create a copy of UserInfoUnion
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({
Expand Down Expand Up @@ -172,7 +178,9 @@ class _$UserInfoImpl implements UserInfo {
int get hashCode => Object.hash(
runtimeType, email, loginIdentifier, updatedAt, primarySectionId);

@JsonKey(ignore: true)
/// Create a copy of UserInfoUnion
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@override
@pragma('vm:prefer-inline')
_$$UserInfoImplCopyWith<_$UserInfoImpl> get copyWith =>
Expand All @@ -194,8 +202,11 @@ abstract class UserInfo implements UserInfoUnion {
DateTime get updatedAt;
@override
int get primarySectionId;

/// Create a copy of UserInfoUnion
/// with the given fields replaced by the non-null parameter values.
@override
@JsonKey(ignore: true)
@JsonKey(includeFromJson: false, includeToJson: false)
_$$UserInfoImplCopyWith<_$UserInfoImpl> get copyWith =>
throw _privateConstructorUsedError;
}
13 changes: 7 additions & 6 deletions examples/freezed/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=2.18.7 <4.0.0"
sdk: ^3.6.0
resolution: workspace

dependencies:
auto_mappr_annotation: ^2.0.0
equatable: ^2.0.5
auto_mappr_annotation: ^2.3.0
equatable: ^2.0.7
freezed_annotation: ^2.2.0

dev_dependencies:
auto_mappr: ^2.0.0
auto_mappr: ^2.6.0
build_runner: ^2.0.0
freezed: ^2.3.2
netglade_analysis: ^8.0.0
test: ^1.16.0
netglade_analysis: ^15.0.0
test: ^1.25.8
16 changes: 8 additions & 8 deletions examples/injectable/lib/getit.config.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions examples/injectable/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=2.18.7 <4.0.0"
sdk: ^3.6.0
resolution: workspace

dependencies:
auto_mappr_annotation: ^2.0.0
equatable: ^2.0.5
get_it: ^7.3.0
injectable: ^2.1.1
auto_mappr_annotation: ^2.3.0
equatable: ^2.0.7
get_it: ^8.0.0
injectable: ^2.5.0

dev_dependencies:
auto_mappr: ^2.0.0
auto_mappr: ^2.6.0
build_runner: ^2.0.0
injectable_generator: ^2.1.5
netglade_analysis: ^8.0.0
test: ^1.16.0
injectable_generator: ^2.6.2
netglade_analysis: ^15.0.0
test: ^1.25.8
13 changes: 7 additions & 6 deletions examples/json_serializable/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=2.18.7 <4.0.0"
sdk: ^3.6.0
resolution: workspace

dependencies:
auto_mappr_annotation: ^2.0.0
json_annotation: ^4.8.1
auto_mappr_annotation: ^2.3.0
json_annotation: ^4.9.0

dev_dependencies:
auto_mappr: ^2.0.0
auto_mappr: ^2.6.0
build_runner: ^2.0.0
json_serializable: ^6.6.1
netglade_analysis: ^8.0.0
test: ^1.16.0
netglade_analysis: ^15.0.0
test: ^1.25.8
62 changes: 0 additions & 62 deletions melos.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions packages/auto_mappr/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
[//]: # (## Unreleased)

## 2.6.0
- Update dependencies
- Update get_it dependency to ^8.0.0

## 2.5.0
- Add support for safe mapping (mapping exceptions handling). [#216](https://github.com/netglade/auto_mappr/pull/216)

Expand Down
13 changes: 11 additions & 2 deletions packages/auto_mappr/analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,14 @@ dart_code_metrics:
avoid-top-level-members-in-tests:
exclude:
- test/integration/fixture/**
avoid-non-null-assertion: false # TODO
avoid-nullable-interpolation: false # TODO
avoid-commented-out-code: false # code examples in comments
prefer-single-declaration-per-file:
exclude:
- test/integration/fixture/**
prefer-named-parameters: false # TODO: release new major version (breaking change)
prefer-boolean-prefixes: false # TODO: release new major version (breaking change)
# TODO: release new major version (breaking change) - uncomment lines below
# prefer-boolean-prefixes:
# exclude:
# - test/integration/fixture/**
# prefixes: ['include' , 'use', 'are', 'assign', 'with', 'will', 'maybe']
Loading

0 comments on commit 579e160

Please sign in to comment.