Skip to content
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
6 changes: 6 additions & 0 deletions mobx_codegen/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.7.3
- Update analyzer version to `>=7.4.0 < 9.0.0`
- Update source_gen version to `>=3.0.0 < 5.0.0`
- Update build version to `>=3.0.0 < 5.0.0`
- Update build_resolvers version to `>=3.0.0 < 5.0.0`

## 2.7.2
- Update analyzer version to `>=7.4.0 < 8.0.0`
- Update source_gen version to 3.0.0
Expand Down
1 change: 1 addition & 0 deletions mobx_codegen/lib/src/mobx_codegen_base.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/doc/element_model_migration_guide.md

// ignore_for_file: deprecated_member_use

import 'dart:async';
Expand Down
15 changes: 10 additions & 5 deletions mobx_codegen/lib/src/store_class_visitor.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/doc/element_model_migration_guide.md

// ignore_for_file: deprecated_member_use

import 'package:analyzer/dart/element/element2.dart';
Expand Down Expand Up @@ -40,11 +41,14 @@ class StoreClassVisitor extends SimpleElementVisitor2 {
..publicTypeName = publicTypeName;
}

final _observableChecker = const TypeChecker.fromRuntime(MakeObservable);
final _observableChecker =
const TypeChecker.typeNamed(MakeObservable, inPackage: 'mobx');

final _computedChecker = const TypeChecker.fromRuntime(ComputedMethod);
final _computedChecker =
const TypeChecker.typeNamed(ComputedMethod, inPackage: 'mobx');

final _actionChecker = const TypeChecker.fromRuntime(MakeAction);
final _actionChecker =
const TypeChecker.typeNamed(MakeAction, inPackage: 'mobx');

final _asyncChecker = AsyncMethodChecker();

Expand Down Expand Up @@ -278,8 +282,9 @@ class StoreClassVisitor extends SimpleElementVisitor2 {
);
}

const _storeMixinChecker = TypeChecker.fromRuntime(Store);
const _toStringAnnotationChecker = TypeChecker.fromRuntime(StoreConfig);
const _storeMixinChecker = TypeChecker.typeNamed(Store, inPackage: 'mobx');
const _toStringAnnotationChecker =
TypeChecker.typeNamed(StoreConfig, inPackage: 'mobx');

bool isMixinStoreClass(ClassElement2 classElement) =>
classElement.mixins.any(_storeMixinChecker.isExactlyType);
Expand Down
6 changes: 3 additions & 3 deletions mobx_codegen/lib/src/template/method_override.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use

import 'package:analyzer/dart/element/element2.dart';
import 'package:mobx_codegen/src/template/comma_list.dart';
import 'package:mobx_codegen/src/template/params.dart';
Expand All @@ -9,11 +11,10 @@ class MethodOverrideTemplate {
MethodOverrideTemplate();

MethodOverrideTemplate.fromElement(
// ignore: deprecated_member_use
ExecutableElement2 method,
LibraryScopedNameFinder typeNameFinder,
) {
// ignore: prefer_function_declarations_over_variables, deprecated_member_use
// ignore: prefer_function_declarations_over_variables
final param = (FormalParameterElement element) => ParamTemplate(
name: element.name3!,
type: typeNameFinder.findParameterTypeName(element),
Expand All @@ -34,7 +35,6 @@ class MethodOverrideTemplate {
this
..name = method.name3!
..returnType = typeNameFinder.findReturnTypeName(method)
// ignore: deprecated_member_use
..setTypeParams(method.typeParameters2
.map((type) => typeParamTemplate(type, typeNameFinder)))
..positionalParams = positionalParams.map(param)
Expand Down
3 changes: 2 additions & 1 deletion mobx_codegen/lib/src/template/observable.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use

import 'package:analyzer/dart/element/element2.dart';
import 'package:meta/meta.dart';
import 'package:mobx_codegen/src/template/store.dart';
Expand All @@ -23,7 +25,6 @@ class ObservableTemplate {
final bool isPrivate;
final bool isReadOnly;
final bool isLate;
// ignore: deprecated_member_use
final ExecutableElement2? equals;
final bool? useDeepEquality;

Expand Down
5 changes: 2 additions & 3 deletions mobx_codegen/lib/src/template/util.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use

import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:mobx_codegen/src/template/params.dart';
Expand All @@ -19,14 +21,12 @@ class AsyncMethodChecker {

late TypeChecker _checkStream;

// ignore: deprecated_member_use
bool returnsFuture(MethodElement2 method) =>
method.returnType.isDartAsyncFuture ||
(method.fragments.any((fragment) => fragment.isAsynchronous) &&
!method.fragments.any((fragment) => fragment.isGenerator) &&
method.returnType is DynamicType);

// ignore: deprecated_member_use
bool returnsStream(MethodElement2 method) =>
_checkStream.isAssignableFromType(method.returnType) ||
(method.fragments.any((fragment) => fragment.isAsynchronous) &&
Expand All @@ -35,7 +35,6 @@ class AsyncMethodChecker {
}

TypeParamTemplate typeParamTemplate(
// ignore: deprecated_member_use
TypeParameterElement2 param,
LibraryScopedNameFinder typeNameFinder,
) =>
Expand Down
1 change: 1 addition & 0 deletions mobx_codegen/lib/src/type_names.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/doc/element_model_migration_guide.md

// ignore_for_file: deprecated_member_use

import 'package:analyzer/dart/element/element2.dart';
Expand Down
2 changes: 1 addition & 1 deletion mobx_codegen/lib/version.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated via set_version.dart. !!!DO NOT MODIFY BY HAND!!!

/// The current version as per `pubspec.yaml`.
const version = '2.7.2';
const version = '2.7.3';
10 changes: 5 additions & 5 deletions mobx_codegen/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: mobx_codegen
description: Code generator for MobX that adds support for annotating your code with @observable, @computed, @action and also creating Store classes.
version: 2.7.2
version: 2.7.3

repository: https://github.com/mobxjs/mobx.dart
issue_tracker: https://github.com/mobxjs/mobx.dart/issues
Expand All @@ -14,13 +14,13 @@ environment:
sdk: '>=3.0.0 <4.0.0'

dependencies:
analyzer: '>=7.4.0 <8.0.0'
build: ^3.0.0
build_resolvers: ^3.0.0
analyzer: '>=7.4.0 < 9.0.0'
build: '>=3.0.0 < 5.0.0'
build_resolvers: '>=3.0.0 < 5.0.0'
meta: ^1.3.0
mobx: ^2.5.0
path: ^1.8.0
source_gen: ^3.0.0
source_gen: '>=3.0.0 < 5.0.0'

dev_dependencies:
build_runner: ^2.6.0
Expand Down
8 changes: 3 additions & 5 deletions mobx_codegen/test/store_class_visitor_test.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use

import 'package:analyzer/dart/element/element2.dart';
import 'package:build/build.dart';
import 'package:mobx_codegen/src/store_class_visitor.dart';
Expand All @@ -8,9 +10,7 @@ import 'package:mocktail/mocktail.dart';
import 'package:test/test.dart';

class PropertyAccessorElementMock extends Fake
// ignore: deprecated_member_use
implements
PropertyAccessorElement2 {
implements PropertyAccessorElement2 {
PropertyAccessorElementMock(this._displayName);

final String _displayName;
Expand All @@ -19,7 +19,6 @@ class PropertyAccessorElementMock extends Fake
String get displayName => _displayName;
}

// ignore: deprecated_member_use
class ClassElementMock extends Fake implements ClassElement2 {
ClassElementMock(this._name);

Expand All @@ -29,7 +28,6 @@ class ClassElementMock extends Fake implements ClassElement2 {
String get name3 => _name;

@override
// ignore: deprecated_member_use
List<TypeParameterElement2> get typeParameters2 => [];
}

Expand Down
3 changes: 2 additions & 1 deletion mobx_codegen/test/util_test.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use

import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:mobx_codegen/src/template/util.dart';
Expand All @@ -8,7 +10,6 @@ import 'package:test/test.dart';

class MockTypeChecker extends Mock implements TypeChecker {}

// ignore: deprecated_member_use
class MockMethod extends Mock implements MethodElement2 {}

class MockMethodFragment extends Mock implements MethodFragment {}
Expand Down
2 changes: 1 addition & 1 deletion mobx_examples/lib/clock/clock.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Clock {
print('Clock stopped ticking');
}

void _onTick(_) {
void _onTick(dynamic _) {
_atom.reportChanged();
}
}