From e39c1e76eeb0c3f6275ee4dcbe0702b35507ce3c Mon Sep 17 00:00:00 2001 From: spirifoxy Date: Wed, 7 Oct 2020 00:23:26 +0200 Subject: [PATCH 1/2] Update packages versions and related code --- analysis_options.yaml | 1 - package/inject/pubspec.yaml | 2 +- .../lib/src/analyzer/utils.dart | 2 +- .../lib/src/analyzer/visitors.dart | 4 +-- .../lib/src/build/summary_builder.dart | 1 + package/inject_generator/lib/src/context.dart | 6 +--- package/inject_generator/pubspec.yaml | 28 +++++++++---------- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 14ebff3..0c48a59 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,5 +1,4 @@ analyzer: - strong-mode: true exclude: - "**/*.dart_tool/*" - "**/build/*" diff --git a/package/inject/pubspec.yaml b/package/inject/pubspec.yaml index 3edf1b1..6220ae9 100644 --- a/package/inject/pubspec.yaml +++ b/package/inject/pubspec.yaml @@ -10,4 +10,4 @@ environment: sdk: '>=2.0.0 <3.0.0' dependencies: - meta: ^1.1.2 + meta: ^1.2.3 diff --git a/package/inject_generator/lib/src/analyzer/utils.dart b/package/inject_generator/lib/src/analyzer/utils.dart index f21449b..ea1af3a 100644 --- a/package/inject_generator/lib/src/analyzer/utils.dart +++ b/package/inject_generator/lib/src/analyzer/utils.dart @@ -11,7 +11,7 @@ import 'package:inject_generator/src/source/symbol_path.dart'; /// Constructs a serializable path to [element]. SymbolPath getSymbolPath(Element element) { - if (element is TypeDefiningElement && element.type.isDynamic) { + if (element is TypeDefiningElement && element.kind == ElementKind.DYNAMIC) { throw new ArgumentError('Dynamic element type not supported. This is a ' 'package:inject bug. Please report it.'); } diff --git a/package/inject_generator/lib/src/analyzer/visitors.dart b/package/inject_generator/lib/src/analyzer/visitors.dart index 47ca33c..1513f24 100644 --- a/package/inject_generator/lib/src/analyzer/visitors.dart +++ b/package/inject_generator/lib/src/analyzer/visitors.dart @@ -117,7 +117,7 @@ class _LibraryVisitor extends RecursiveElementVisitor { List _extractModules(ClassElement clazz) { ElementAnnotation annotation = getInjectorAnnotation(clazz); List modules = - annotation.constantValue.getField('modules').toListValue(); + annotation.computeConstantValue().getField('modules').toListValue(); if (modules == null) { return const []; } @@ -140,7 +140,7 @@ abstract class InjectClassVisitor { /// Call to start visiting [clazz]. void visitClass(ClassElement clazz) { - for (var supertype in clazz.allSupertypes.where((t) => !t.isObject)) { + for (var supertype in clazz.allSupertypes.where((t) => !t.isDartCoreObject)) { new _AnnotatedClassVisitor(this).visitClassElement(supertype.element); } new _AnnotatedClassVisitor(this).visitClassElement(clazz); diff --git a/package/inject_generator/lib/src/build/summary_builder.dart b/package/inject_generator/lib/src/build/summary_builder.dart index 5c610e5..48b076b 100644 --- a/package/inject_generator/lib/src/build/summary_builder.dart +++ b/package/inject_generator/lib/src/build/summary_builder.dart @@ -303,6 +303,7 @@ class _ProviderSummaryVisitor extends InjectClassVisitor { ProviderSummary _createConstructorProviderSummary( ConstructorElement element, bool isSingleton) { + // TODO 'type' is marked as deprecated and removed in future analyzer releases var returnType = element.enclosingElement.type; return new ProviderSummary( getInjectedType(returnType), element.name, ProviderKind.constructor, diff --git a/package/inject_generator/lib/src/context.dart b/package/inject_generator/lib/src/context.dart index b18ca39..32af485 100644 --- a/package/inject_generator/lib/src/context.dart +++ b/package/inject_generator/lib/src/context.dart @@ -9,10 +9,6 @@ import 'dart:async'; import 'package:analyzer/dart/analysis/results.dart'; -// -import 'package:analyzer/src/dart/analysis/results.dart'; -// - import 'package:analyzer/dart/element/element.dart'; import 'package:build/build.dart'; import 'package:build/build.dart' as build show log; @@ -103,7 +99,7 @@ class BuilderLogger { // ElementDeclarationResult elementDeclaration; if (element.kind != ElementKind.DYNAMIC) { - var parsedLibrary = ParsedLibraryResultImpl.tmp(element.library); + var parsedLibrary = element.library.session.getParsedLibraryByElement(element.library); if (parsedLibrary.state == ResultState.VALID) { elementDeclaration = parsedLibrary.getElementDeclaration(element); } diff --git a/package/inject_generator/pubspec.yaml b/package/inject_generator/pubspec.yaml index bf5941c..3bb6295 100644 --- a/package/inject_generator/pubspec.yaml +++ b/package/inject_generator/pubspec.yaml @@ -7,23 +7,23 @@ authors: homepage: https://pub.dartlang.org/packages/inject environment: - sdk: '>=2.0.0 <3.0.0' + sdk: '>=2.10.0 <3.0.0' dependencies: - analyzer: ^0.34.0 - build: ^1.0.0 - code_builder: ^3.0.3 - collection: ^1.14.7 - dart_style: ^1.0.10 - logging: ^0.11.3+1 - meta: ^1.1.2 - path: ^1.5.1 - quiver: ^2.0.0 - stack_trace: ^1.9.2 + analyzer: ^0.39.14 + build: ^1.3.0 + code_builder: ^3.4.1 + collection: ^1.14.13 + dart_style: ^1.3.0 + logging: ^0.11.4 + meta: ^1.2.3 + path: ^1.7.0 + quiver: ^2.1.3 + stack_trace: ^1.9.5 dev_dependencies: - build_runner: ^1.0.0 - build_test: ^0.10.0 + build_runner: ^1.2.3 + build_test: ^1.1.0 inject: path: ../inject - test: ^1.5.0 + test: ^1.15.4 From 2bfc6f12d57d81ffc4590729c47031ecf386eed3 Mon Sep 17 00:00:00 2001 From: spirifoxy Date: Wed, 7 Oct 2020 00:55:01 +0200 Subject: [PATCH 2/2] Undo removing string-mode from analyzer options --- analysis_options.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/analysis_options.yaml b/analysis_options.yaml index 0c48a59..14ebff3 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,5 @@ analyzer: + strong-mode: true exclude: - "**/*.dart_tool/*" - "**/build/*"