diff --git a/packages/cli/pubspec.yaml b/packages/cli/pubspec.yaml index 9b7f16a37..aa6b4f985 100644 --- a/packages/cli/pubspec.yaml +++ b/packages/cli/pubspec.yaml @@ -5,7 +5,7 @@ description: A modern HTTP server application framework, ORM and OAuth2 provider environment: sdk: ">=3.2.0 <4.0.0" dependencies: - analyzer: ^5.1.0 + analyzer: ^6.3.0 args: ^2.1.1 collection: ^1.15.0 conduit_common: ^4.3.7 diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index a44dea748..05688d36b 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -5,7 +5,7 @@ description: This is the core of the framework. environment: sdk: ">=3.2.0 <4.0.0" dependencies: - analyzer: ^5.1.0 + analyzer: ^6.3.0 args: ^2.1.1 collection: ^1.15.0 conduit_common: ^4.3.7 diff --git a/packages/isolate_exec/pubspec.yaml b/packages/isolate_exec/pubspec.yaml index 0475ec5f2..e113359a3 100644 --- a/packages/isolate_exec/pubspec.yaml +++ b/packages/isolate_exec/pubspec.yaml @@ -5,7 +5,7 @@ description: This library contains types that allow for executing code in a spaw environment: sdk: ">=3.2.0 <4.0.0" dependencies: - analyzer: ^5.1.0 + analyzer: ^6.3.0 glob: ^2.0.0 path: ^1.8.0 dev_dependencies: diff --git a/packages/runtime/lib/src/analyzer.dart b/packages/runtime/lib/src/analyzer.dart index 29c88a0b9..40f7b7ef2 100644 --- a/packages/runtime/lib/src/analyzer.dart +++ b/packages/runtime/lib/src/analyzer.dart @@ -103,7 +103,7 @@ class CodeAnalyzer { .declarations .whereType() .where((c) => - c.extendsClause?.superclass.name2.stringValue == superclassName) + c.extendsClause?.superclass.name2.toString() == superclassName) .toList(); } diff --git a/packages/runtime/pubspec.yaml b/packages/runtime/pubspec.yaml index 16fd85ae4..0529c321b 100644 --- a/packages/runtime/pubspec.yaml +++ b/packages/runtime/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/conduit-dart/conduit-runtime environment: sdk: '>=3.2.0 <4.0.0' dependencies: - analyzer: ^5.1.0 + analyzer: ^6.3.0 args: ^2.0.0 conduit_isolate_exec: ^4.3.7 io: ^1.0.3 diff --git a/packages/runtime/test/project_analyzer_test.dart b/packages/runtime/test/project_analyzer_test.dart index 7c5b8b3ac..87364ee93 100644 --- a/packages/runtime/test/project_analyzer_test.dart +++ b/packages/runtime/test/project_analyzer_test.dart @@ -23,6 +23,6 @@ void main() { ); expect(klass, isNotNull); expect(klass!.name.value(), "ConsumerSubclass"); - expect(klass.extendsClause!.superclass.name2.stringValue, "Consumer"); + expect(klass.extendsClause!.superclass.name2.toString(), "Consumer"); }); } diff --git a/packages/test_harness/lib/src/agent.dart b/packages/test_harness/lib/src/agent.dart index 4e23f7aee..dc7fdf44b 100644 --- a/packages/test_harness/lib/src/agent.dart +++ b/packages/test_harness/lib/src/agent.dart @@ -93,10 +93,10 @@ class Agent { /// The base URL that this agent's requests will be made against. String get baseURL { if (_application != null) { - if (!_application!.isRunning) { + if (!_application.isRunning) { throw StateError("Application under test is not running."); } - return "${_application!.server.requiresHTTPS ? "https" : "http"}://localhost:${_application!.channel.server.server!.port}"; + return "${_application.server.requiresHTTPS ? "https" : "http"}://localhost:${_application.channel.server.server!.port}"; } return "$_scheme://$_host:$_port"; diff --git a/packages/test_harness/pubspec.yaml b/packages/test_harness/pubspec.yaml index cba7083fe..bdf1539a2 100644 --- a/packages/test_harness/pubspec.yaml +++ b/packages/test_harness/pubspec.yaml @@ -12,4 +12,4 @@ dev_dependencies: conduit_postgresql: path: ../postgresql lints: ^3.0.0 - test_core: ^0.4.18 + test_core: ^0.5.9