Skip to content

Update dependencies #1830

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

Open
wants to merge 2 commits into
base: community
Choose a base branch
from
Open
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 packages/ejson/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ dependencies:
dev_dependencies:
build_runner: ^2.0.0
ejson_generator: ^0.4.0
lints: ^3.0.0
lints: ^5.0.0
test: ^1.21.0
6 changes: 3 additions & 3 deletions packages/ejson_analyzer/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ environment:
sdk: ^3.3.0

dependencies:
analyzer: ^6.0.0
analyzer: ^7.0.0
ejson_annotation: ^0.4.0
source_gen: ^1.3.2
source_gen: ^2.0.0

dev_dependencies:
lints: ^3.0.0
lints: ^5.0.0
test: ^1.21.0
2 changes: 1 addition & 1 deletion packages/ejson_annotation/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ environment:
sdk: ^3.3.0

dev_dependencies:
lints: ^3.0.0
lints: ^5.0.0
8 changes: 4 additions & 4 deletions packages/ejson_generator/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ environment:
sdk: ^3.3.0

dependencies:
analyzer: ^6.0.0
analyzer: ^7.0.0
build: ^2.4.0
ejson_analyzer: ^0.4.0
source_gen: ^1.3.2
source_gen: ^2.0.0

dev_dependencies:
build_runner: ^2.4.4
build_test: ^2.1.7
dart_style: ^2.3.1
dart_style: ^3.0.1
ejson: ^0.4.0
ejson_annotation: ^0.4.0
lints: ^3.0.0
lints: ^5.0.0
meta: ^1.9.1
test: ^1.21.0
3 changes: 2 additions & 1 deletion packages/ejson_generator/test/compile_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import 'package:ejson_generator/ejson_generator.dart';
import 'package:source_gen/source_gen.dart';
import 'package:test/test.dart';
import 'package:meta/meta.dart';
import 'package:pub_semver/pub_semver.dart';

final _formatter = DartFormatter(lineEnding: '\n');
final _formatter = DartFormatter(lineEnding: '\n', languageVersion: Version(3, 3, 0));
final _tag = RegExp(r'// \*.*\n// EJsonGenerator\n// \*.*');

@isTest
Expand Down
40 changes: 24 additions & 16 deletions packages/ejson_generator/test/ctor_test.g.dart

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

6 changes: 3 additions & 3 deletions packages/ejson_lint/lib/src/lints/mismatched_getter_type.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ class MismatchedGetterType extends DartLintRule {
final ctor = node.declaredElement;
if (ctor == null) return; // not resolved;
if (isEJsonAnnotated(ctor)) {
final cls = ctor.enclosingElement as ClassElement;
final cls = ctor.enclosingElement3 as ClassElement;
for (final param in ctor.parameters) {
final getter = cls.getGetter(param.name);
if (getter == null) continue;
if (getter.returnType != param.type) {
reporter.reportErrorForElement(code, getter);
reporter.reportErrorForElement(code, param);
reporter.atElement(getter, code);
reporter.atElement(param, code);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/ejson_lint/lib/src/lints/missing_getter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ class MissingGetter extends DartLintRule {
final ctor = node.declaredElement;
if (ctor == null) return; // not resolved;
if (isEJsonAnnotated(ctor)) {
final cls = ctor.enclosingElement as ClassElement;
final cls = ctor.enclosingElement3 as ClassElement;
for (final param in ctor.parameters) {
final getter = cls.getGetter(param.name);
if (getter == null) reporter.reportErrorForElement(code, param);
if (getter == null) reporter.atElement(param, code);
}
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class TooManyAnnotatedConstructors extends DartLintRule {
final annotatedConstructors = cls.constructors.where((ctor) => isEJsonAnnotated(ctor));
if (annotatedConstructors.length > 1) {
for (final ctor in annotatedConstructors) {
reporter.reportErrorForElement(code, ctor);
reporter.atElement(ctor, code);
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/realm_dart/dev/lib/src/build.dart
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class BuildNativeCommand extends BaseCommand {
final iosSdkOptions = argResults['ios-sdk'] as List<String>;
final iosSdks = iosSdkOptions.contains('all') // if 'all' is specified, build for all available SDKs
? iOSSdk.values
: iosSdkOptions.map((o) => iOSSdk.from(o)).whereNotNull();
: iosSdkOptions.map((o) => iOSSdk.from(o)).nonNulls;

for (final target in targets) {
logger.info('Building for ${target.name} in ${buildMode.name} mode');
Expand Down
1 change: 0 additions & 1 deletion packages/realm_dart/test/backlinks_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0

import 'package:realm_dart/realm.dart';
import 'package:test/test.dart' hide test, throws;

import 'test.dart';

Expand Down
3 changes: 0 additions & 3 deletions packages/realm_dart/test/geospatial_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
import 'dart:async';
import 'dart:math';

import 'package:realm_common/realm_common.dart';
import 'package:test/test.dart' hide test, throws;

import 'package:realm_dart/realm.dart';
import 'test.dart';

Expand Down
1 change: 0 additions & 1 deletion packages/realm_dart/test/indexed_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import 'dart:math';
import 'dart:typed_data';

import 'package:test/test.dart' hide test, throws;
import 'test.dart';

import 'package:realm_dart/realm.dart';
Expand Down
1 change: 0 additions & 1 deletion packages/realm_dart/test/list_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'dart:math';

import 'package:collection/collection.dart';
import 'package:meta/meta.dart';
import 'package:test/test.dart' hide test, throws;
import 'package:realm_dart/realm.dart';
import 'test.dart';

Expand Down
1 change: 0 additions & 1 deletion packages/realm_dart/test/migration_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// ignore_for_file: unused_local_variable

import 'dart:async';
import 'package:test/test.dart' hide test, throws;
import 'package:realm_dart/realm.dart';
import 'test.dart';
import 'package:realm_dart/src/results.dart';
Expand Down
1 change: 0 additions & 1 deletion packages/realm_dart/test/realm_set_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import 'dart:typed_data';

import 'package:collection/collection.dart';
import 'package:realm_dart/realm.dart';
import 'package:test/test.dart' hide test, throws;

import 'test.dart';

Expand Down
1 change: 0 additions & 1 deletion packages/realm_dart/test/realm_value_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import 'dart:typed_data';
import 'package:collection/collection.dart';
import 'package:realm_common/realm_common.dart' show memEquals;
import 'package:realm_dart/realm.dart';
import 'package:test/test.dart' hide test, throws;

import 'test.dart';

Expand Down
1 change: 0 additions & 1 deletion packages/realm_dart/test/results_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// ignore_for_file: unused_local_variable

import 'dart:typed_data';
import 'package:test/test.dart' hide test, throws;

import 'package:realm_dart/realm.dart';
import 'test.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/realm_generator/lib/src/error.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class RealmInvalidGenerationSourceError extends InvalidGenerationSourceError {
color = color ?? session.color,
super(element: element) {
if (element is FieldElement || element is ConstructorElement) {
final classElement = element.enclosingElement!;
final classElement = element.enclosingElement3!;
this.secondarySpans.addAll({
classElement.span!: "in realm model for '${session.mapping.entries.where((e) => e.value == classElement).singleOrNull?.key}'",
});
Expand Down
10 changes: 5 additions & 5 deletions packages/realm_generator/lib/src/field_element_ex.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import 'type_checkers.dart';
extension FieldElementEx on FieldElement {
static const realmSetUnsupportedRealmTypes = [RealmPropertyType.linkingObjects];

ClassElement get enclosingClassElement => enclosingElement as ClassElement;
ClassElement get enclosingClassElement => enclosingElement3 as ClassElement;

FieldDeclaration get declarationAstNode => getDeclarationFromElement(this)!.node.parent!.parent as FieldDeclaration;

Expand Down Expand Up @@ -163,7 +163,7 @@ extension FieldElementEx on FieldElement {
String? linkOriginProperty;

// Validate field type
final modelSpan = enclosingElement.span!;
final modelSpan = enclosingElement3.span!;
final file = modelSpan.file;
final realmType = type.realmType;
if (realmType == null) {
Expand All @@ -185,7 +185,7 @@ extension FieldElementEx on FieldElement {
primarySpan: typeSpan(file),
primaryLabel: '$modelTypeName is not a realm model type',
secondarySpans: {
modelSpan: "in realm model '${enclosingElement.displayName}'",
modelSpan: "in realm model '${enclosingElement3.displayName}'",
// may go both above and below, or stem from another file
if (notARealmTypeSpan != null) notARealmTypeSpan: ''
},
Expand Down Expand Up @@ -293,7 +293,7 @@ extension FieldElementEx on FieldElement {
);
}

final thisType = (enclosingElement as ClassElement).thisType;
final thisType = (enclosingElement3 as ClassElement).thisType;
final linkType = thisType.asNullable;
final listOf = session.typeProvider.listType(thisType);
if (sourceField.type != linkType && sourceField.type != listOf) {
Expand Down Expand Up @@ -398,7 +398,7 @@ extension FieldElementEx on FieldElement {
ParenthesizedExpression i => _isValidFieldInitializer(i.expression),
PrefixExpression e => _isValidFieldInitializer(e.operand),
BinaryExpression b => _isValidFieldInitializer(b.leftOperand) && _isValidFieldInitializer(b.rightOperand),
Identifier i => (i.staticElement as PropertyAccessorElement?)?.variable.isConst ?? false,
Identifier i => (i.staticElement as PropertyAccessorElement?)?.variable2?.isConst ?? false,
_ => false,
};
}
Expand Down
8 changes: 4 additions & 4 deletions packages/realm_generator/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ environment:
sdk: ^3.3.0

dependencies:
analyzer: ^6.0.0
analyzer: ^7.0.0
build_resolvers: ^2.0.9
build: ^2.0.0
dart_style: ^2.2.0
dart_style: ^3.0.0
realm_common: ^20.0.1
source_gen: ^1.1.0
source_gen: ^2.0.0
source_span: ^1.8.0
collection: ^1.18.0

dev_dependencies:
build_runner: ^2.1.0
build_test: ^2.1.4
lints: ^3.0.0
lints: ^5.0.0
logging: ^1.2.0
meta: ^1.7.0
path: ^1.0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// dart format width=80
// GENERATED CODE - DO NOT MODIFY BY HAND

part of 'all_named_ctor.dart';
Expand All @@ -11,14 +12,9 @@ part of 'all_named_ctor.dart';
class Person extends _Person with RealmEntity, RealmObjectBase, RealmObject {
static var _defaultsSet = false;

Person({
required String name,
int age = 42,
}) {
Person({required String name, int age = 42}) {
if (!_defaultsSet) {
_defaultsSet = RealmObjectBase.setDefaults<Person>({
'age': 42,
});
_defaultsSet = RealmObjectBase.setDefaults<Person>({'age': 42});
}
RealmObjectBase.set(this, 'name', name);
RealmObjectBase.set(this, 'age', age);
Expand Down Expand Up @@ -48,19 +44,14 @@ class Person extends _Person with RealmEntity, RealmObjectBase, RealmObject {
Person freeze() => RealmObjectBase.freezeObject<Person>(this);

EJsonValue toEJson() {
return <String, dynamic>{
'name': name.toEJson(),
'age': age.toEJson(),
};
return <String, dynamic>{'name': name.toEJson(), 'age': age.toEJson()};
}

static EJsonValue _toEJson(Person value) => value.toEJson();
static Person _fromEJson(EJsonValue ejson) {
if (ejson is! Map<String, dynamic>) return raiseInvalidEJson(ejson);
return switch (ejson) {
{
'name': EJsonValue name,
} =>
{'name': EJsonValue name} =>
Person(
name: fromEJson(name),
age: fromEJson(ejson['age'], defaultValue: 42),
Expand Down
Loading