From ac317957fabf86b55ca87853dc94b841d8ba7171 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 2 Feb 2021 10:37:54 -0800 Subject: [PATCH 1/6] Update sdk version and opt out the universe --- bin/dartdoc.dart | 2 ++ lib/dartdoc.dart | 2 ++ lib/options.dart | 2 ++ lib/src/dartdoc_options.dart | 2 ++ lib/src/element_type.dart | 2 ++ lib/src/experiment_options.dart | 2 ++ lib/src/generator/dartdoc_generator_backend.dart | 2 ++ lib/src/generator/empty_generator.dart | 2 ++ lib/src/generator/generator.dart | 2 ++ lib/src/generator/generator_frontend.dart | 2 ++ lib/src/generator/generator_utils.dart | 2 ++ lib/src/generator/html_generator.dart | 2 ++ lib/src/generator/html_resources.g.dart | 2 ++ lib/src/generator/markdown_generator.dart | 2 ++ lib/src/generator/resource_loader.dart | 2 ++ lib/src/generator/template_data.dart | 2 ++ lib/src/generator/templates.dart | 2 ++ lib/src/generator/templates.renderers.dart | 2 ++ lib/src/io_utils.dart | 2 ++ lib/src/logging.dart | 2 ++ lib/src/markdown_processor.dart | 2 ++ lib/src/model/accessor.dart | 2 ++ lib/src/model/canonicalization.dart | 2 ++ lib/src/model/categorization.dart | 2 ++ lib/src/model/category.dart | 2 ++ lib/src/model/class.dart | 2 ++ lib/src/model/constructor.dart | 2 ++ lib/src/model/container.dart | 2 ++ lib/src/model/container_member.dart | 2 ++ lib/src/model/documentable.dart | 2 ++ lib/src/model/documentation.dart | 2 ++ lib/src/model/documentation_comment.dart | 2 ++ lib/src/model/dynamic.dart | 2 ++ lib/src/model/enclosed_element.dart | 2 ++ lib/src/model/enum.dart | 2 ++ lib/src/model/extendable.dart | 2 ++ lib/src/model/extension.dart | 2 ++ lib/src/model/extension_target.dart | 2 ++ lib/src/model/feature_set.dart | 2 ++ lib/src/model/field.dart | 2 ++ lib/src/model/getter_setter_combo.dart | 2 ++ lib/src/model/indexable.dart | 2 ++ lib/src/model/inheritable.dart | 2 ++ lib/src/model/language_feature.dart | 2 ++ lib/src/model/library.dart | 2 ++ lib/src/model/library_container.dart | 2 ++ lib/src/model/locatable.dart | 2 ++ lib/src/model/method.dart | 2 ++ lib/src/model/mixin.dart | 2 ++ lib/src/model/model.dart | 2 ++ lib/src/model/model_element.dart | 2 ++ lib/src/model/model_function.dart | 2 ++ lib/src/model/model_node.dart | 2 ++ lib/src/model/nameable.dart | 2 ++ lib/src/model/never.dart | 2 ++ lib/src/model/operator.dart | 2 ++ lib/src/model/package.dart | 2 ++ lib/src/model/package_builder.dart | 2 ++ lib/src/model/package_graph.dart | 2 ++ lib/src/model/parameter.dart | 2 ++ lib/src/model/privacy.dart | 2 ++ lib/src/model/source_code_mixin.dart | 2 ++ lib/src/model/top_level_container.dart | 2 ++ lib/src/model/top_level_variable.dart | 2 ++ lib/src/model/type_parameter.dart | 2 ++ lib/src/model/typedef.dart | 2 ++ lib/src/model_utils.dart | 2 ++ lib/src/mustachio/annotations.dart | 3 +++ lib/src/mustachio/parser.dart | 2 ++ lib/src/mustachio/renderer_base.dart | 2 ++ lib/src/package_config_provider.dart | 2 ++ lib/src/package_meta.dart | 2 ++ lib/src/quiver.dart | 2 ++ lib/src/render/category_renderer.dart | 2 ++ lib/src/render/documentation_renderer.dart | 2 ++ lib/src/render/element_type_renderer.dart | 2 ++ lib/src/render/enum_field_renderer.dart | 2 ++ lib/src/render/feature_renderer.dart | 2 ++ lib/src/render/model_element_renderer.dart | 2 ++ lib/src/render/parameter_renderer.dart | 2 ++ lib/src/render/renderer_factory.dart | 2 ++ lib/src/render/source_code_renderer.dart | 2 ++ lib/src/render/template_renderer.dart | 2 ++ lib/src/render/type_parameters_renderer.dart | 2 ++ lib/src/render/typedef_renderer.dart | 2 ++ lib/src/source_linker.dart | 2 ++ lib/src/special_elements.dart | 2 ++ lib/src/tool_runner.dart | 2 ++ lib/src/tuple.dart | 2 ++ lib/src/utils.dart | 3 +++ lib/src/version.dart | 3 +++ lib/src/warnings.dart | 2 ++ pubspec.yaml | 8 ++++---- test/dartdoc_options_test.dart | 2 ++ test/documentation_comment_test.dart | 2 ++ test/end2end/dartdoc_integration_test.dart | 2 ++ test/end2end/dartdoc_test.dart | 2 ++ test/end2end/model_special_cases_test.dart | 2 ++ test/end2end/model_test.dart | 2 ++ test/grind_test.dart | 2 ++ test/html_generator_test.dart | 2 ++ test/io_utils_test.dart | 2 ++ test/library_test.dart | 2 ++ test/markdown_processor_test.dart | 2 ++ test/model_utils_test.dart | 2 ++ test/mustachio/builder_test.dart | 2 ++ test/mustachio/foo.dart | 2 ++ test/mustachio/foo.renderers.dart | 2 ++ test/mustachio/parser_test.dart | 2 ++ test/mustachio/renderer_test.dart | 2 ++ test/package_meta_test.dart | 2 ++ test/package_test.dart | 2 ++ test/quiver_test.dart | 2 ++ test/render/template_renderer_test.dart | 2 ++ test/resource_loader_test.dart | 2 ++ test/source_linker_test.dart | 2 ++ test/src/utils.dart | 2 ++ test/template_test.dart | 2 ++ test/tool_runner_test.dart | 2 ++ test/utils_test.dart | 2 ++ test/warnings_test.dart | 2 ++ tool/builder.dart | 2 ++ tool/doc_packages.dart | 2 ++ tool/grind.dart | 2 ++ tool/mustachio/builder.dart | 2 ++ tool/mustachio/codegen_runtime_renderer.dart | 2 ++ tool/subprocess_launcher.dart | 2 ++ 127 files changed, 259 insertions(+), 4 deletions(-) diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart index 83b3f6180f..9b9b87a961 100644 --- a/bin/dartdoc.dart +++ b/bin/dartdoc.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.bin; import 'dart:async'; diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart index 4e620bf6e1..0e88fa55ff 100644 --- a/lib/dartdoc.dart +++ b/lib/dartdoc.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// A documentation generator for Dart. /// /// Library interface is currently under heavy construction and may change diff --git a/lib/options.dart b/lib/options.dart index 76948087fc..b85a306e4b 100644 --- a/lib/options.dart +++ b/lib/options.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + import 'dart:io' show stderr, exitCode; import 'package:analyzer/file_system/file_system.dart'; diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart index e1861212b1..194753632d 100644 --- a/lib/src/dartdoc_options.dart +++ b/lib/src/dartdoc_options.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// /// dartdoc's dartdoc_options.yaml configuration file follows similar loading /// semantics to that of analysis_options.yaml, diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart index e7dab1d650..bfbf3fe3bf 100644 --- a/lib/src/element_type.dart +++ b/lib/src/element_type.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// The models used to represent Dart code. library dartdoc.element_type; diff --git a/lib/src/experiment_options.dart b/lib/src/experiment_options.dart index 017dc942f3..5bf0edd84a 100644 --- a/lib/src/experiment_options.dart +++ b/lib/src/experiment_options.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// /// Implementation of Dart language experiment option handling for dartdoc. /// See https://github.com/dart-lang/sdk/blob/master/docs/process/experimental-flags.md. diff --git a/lib/src/generator/dartdoc_generator_backend.dart b/lib/src/generator/dartdoc_generator_backend.dart index 613f31a79b..6749f43de9 100644 --- a/lib/src/generator/dartdoc_generator_backend.dart +++ b/lib/src/generator/dartdoc_generator_backend.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/dartdoc.dart'; import 'package:dartdoc/src/generator/generator_frontend.dart'; import 'package:dartdoc/src/generator/generator_utils.dart' as generator_util; diff --git a/lib/src/generator/empty_generator.dart b/lib/src/generator/empty_generator.dart index bd2dbb2cfb..4962848af5 100644 --- a/lib/src/generator/empty_generator.dart +++ b/lib/src/generator/empty_generator.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + library dartdoc.empty_generator; import 'package:dartdoc/src/dartdoc_options.dart'; diff --git a/lib/src/generator/generator.dart b/lib/src/generator/generator.dart index 79258ece49..1d25c9b2d3 100644 --- a/lib/src/generator/generator.dart +++ b/lib/src/generator/generator.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// A library containing an abstract documentation generator. library dartdoc.generator; diff --git a/lib/src/generator/generator_frontend.dart b/lib/src/generator/generator_frontend.dart index e99de666bc..64a2e4fd7b 100644 --- a/lib/src/generator/generator_frontend.dart +++ b/lib/src/generator/generator_frontend.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/generator/generator.dart'; import 'package:dartdoc/src/logging.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/generator/generator_utils.dart b/lib/src/generator/generator_utils.dart index d1e1f538ca..8eeddab0db 100644 --- a/lib/src/generator/generator_utils.dart +++ b/lib/src/generator/generator_utils.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:convert'; import 'package:collection/collection.dart'; diff --git a/lib/src/generator/html_generator.dart b/lib/src/generator/html_generator.dart index b9d31740dd..0c372344eb 100644 --- a/lib/src/generator/html_generator.dart +++ b/lib/src/generator/html_generator.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.html_generator; import 'package:dartdoc/dartdoc.dart'; diff --git a/lib/src/generator/html_resources.g.dart b/lib/src/generator/html_resources.g.dart index 56845cee63..17acead7ee 100644 --- a/lib/src/generator/html_resources.g.dart +++ b/lib/src/generator/html_resources.g.dart @@ -1,5 +1,7 @@ // WARNING: This file is auto-generated. Do not taunt. +// @dart=2.9 + const List resource_names = [ 'package:dartdoc/resources/favicon.png', 'package:dartdoc/resources/github.css', diff --git a/lib/src/generator/markdown_generator.dart b/lib/src/generator/markdown_generator.dart index b4770d0ba1..e39ef845f3 100644 --- a/lib/src/generator/markdown_generator.dart +++ b/lib/src/generator/markdown_generator.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/dartdoc.dart'; import 'package:dartdoc/src/generator/dartdoc_generator_backend.dart'; import 'package:dartdoc/src/generator/generator.dart'; diff --git a/lib/src/generator/resource_loader.dart b/lib/src/generator/resource_loader.dart index c8d57a2ad6..5adddc9db5 100644 --- a/lib/src/generator/resource_loader.dart +++ b/lib/src/generator/resource_loader.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// Make it possible to load resources from the dartdoc code repository. library dartdoc.resource_loader; diff --git a/lib/src/generator/template_data.dart b/lib/src/generator/template_data.dart index 8db478d669..f58b26eb0a 100644 --- a/lib/src/generator/template_data.dart +++ b/lib/src/generator/template_data.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; typedef ContainerSidebar = String Function(Container, TemplateData); diff --git a/lib/src/generator/templates.dart b/lib/src/generator/templates.dart index 1e53a5f6e2..3a1a881361 100644 --- a/lib/src/generator/templates.dart +++ b/lib/src/generator/templates.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + // TODO(srawlins): Add Renderer annotations for more types as the mustachio // implementation matures. @Renderer(#renderIndex, Context()) diff --git a/lib/src/generator/templates.renderers.dart b/lib/src/generator/templates.renderers.dart index 892af00e22..84d16527a0 100644 --- a/lib/src/generator/templates.renderers.dart +++ b/lib/src/generator/templates.renderers.dart @@ -3,6 +3,8 @@ // To change the contents of this library, make changes to the builder source // files in the tool/mustachio/ directory. +// @dart=2.9 + // ignore_for_file: camel_case_types, unnecessary_cast, unused_element, unused_import import 'package:analyzer/file_system/file_system.dart'; import 'package:dartdoc/src/generator/template_data.dart'; diff --git a/lib/src/io_utils.dart b/lib/src/io_utils.dart index a93dab00e5..212e4334b4 100644 --- a/lib/src/io_utils.dart +++ b/lib/src/io_utils.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// This is a helper library to make working with io easier. library dartdoc.io_utils; diff --git a/lib/src/logging.dart b/lib/src/logging.dart index 4eff16fe70..f1da42af16 100644 --- a/lib/src/logging.dart +++ b/lib/src/logging.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:convert'; import 'dart:io' show stderr, stdout; diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart index 541a855df2..fa294ef400 100644 --- a/lib/src/markdown_processor.dart +++ b/lib/src/markdown_processor.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// Utility code to convert markdown comments to html. library dartdoc.markdown_processor; diff --git a/lib/src/model/accessor.dart b/lib/src/model/accessor.dart index 274147a7bc..d59915c5e0 100644 --- a/lib/src/model/accessor.dart +++ b/lib/src/model/accessor.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/dart/element/member.dart' show Member; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/canonicalization.dart b/lib/src/model/canonicalization.dart index c7b31b08db..25af108966 100644 --- a/lib/src/model/canonicalization.dart +++ b/lib/src/model/canonicalization.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; /// Classes extending this class have canonicalization support in Dartdoc. diff --git a/lib/src/model/categorization.dart b/lib/src/model/categorization.dart index 0dcce68f91..2fa948934d 100644 --- a/lib/src/model/categorization.dart +++ b/lib/src/model/categorization.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; final RegExp _categoryRegExp = RegExp( diff --git a/lib/src/model/category.dart b/lib/src/model/category.dart index 55f9211732..0dcdd748a7 100644 --- a/lib/src/model/category.dart +++ b/lib/src/model/category.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:dartdoc/src/dartdoc_options.dart'; diff --git a/lib/src/model/class.dart b/lib/src/model/class.dart index 6b4c171dfd..8621d7cb02 100644 --- a/lib/src/model/class.dart +++ b/lib/src/model/class.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; import 'package:dartdoc/src/element_type.dart'; diff --git a/lib/src/model/constructor.dart b/lib/src/model/constructor.dart index 9494f65ad4..72ff082c0e 100644 --- a/lib/src/model/constructor.dart +++ b/lib/src/model/constructor.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:dartdoc/src/element_type.dart'; diff --git a/lib/src/model/container.dart b/lib/src/model/container.dart index 597f27427d..9c144848e4 100644 --- a/lib/src/model/container.dart +++ b/lib/src/model/container.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/model/model.dart'; import 'package:dartdoc/src/model_utils.dart' as model_utils; diff --git a/lib/src/model/container_member.dart b/lib/src/model/container_member.dart index 64c69b089d..87322c5e88 100644 --- a/lib/src/model/container_member.dart +++ b/lib/src/model/container_member.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; /// A [ModelElement] that is a [Container] member. diff --git a/lib/src/model/documentable.dart b/lib/src/model/documentable.dart index 67d1a47b85..973fdd8d19 100644 --- a/lib/src/model/documentable.dart +++ b/lib/src/model/documentable.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/file_system/file_system.dart'; import 'package:dartdoc/src/dartdoc_options.dart'; import 'package:dartdoc/src/io_utils.dart'; diff --git a/lib/src/model/documentation.dart b/lib/src/model/documentation.dart index 659c585b3c..a830a8c3c9 100644 --- a/lib/src/model/documentation.dart +++ b/lib/src/model/documentation.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/markdown_processor.dart'; import 'package:dartdoc/src/model/model.dart'; import 'package:dartdoc/src/render/documentation_renderer.dart'; diff --git a/lib/src/model/documentation_comment.dart b/lib/src/model/documentation_comment.dart index 401e9dc18d..78993764cf 100644 --- a/lib/src/model/documentation_comment.dart +++ b/lib/src/model/documentation_comment.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + import 'package:args/args.dart'; import 'package:crypto/crypto.dart' as crypto; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/dynamic.dart b/lib/src/model/dynamic.dart index a82189b38d..d432832a75 100644 --- a/lib/src/model/dynamic.dart +++ b/lib/src/model/dynamic.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/enclosed_element.dart b/lib/src/model/enclosed_element.dart index 228be4b30a..bc285f4505 100644 --- a/lib/src/model/enclosed_element.dart +++ b/lib/src/model/enclosed_element.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; /// An element that is enclosed by some other element. diff --git a/lib/src/model/enum.dart b/lib/src/model/enum.dart index c6c6da6f85..93762618cb 100644 --- a/lib/src/model/enum.dart +++ b/lib/src/model/enum.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + // TODO(jcollins-g): Consider Enum as subclass of Container? import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/extendable.dart b/lib/src/model/extendable.dart index bb496c6b4f..909bd30a13 100644 --- a/lib/src/model/extendable.dart +++ b/lib/src/model/extendable.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; /// Mixin for subclasses of [ModelElement] representing Elements that can be diff --git a/lib/src/model/extension.dart b/lib/src/model/extension.dart index 52df1eea11..769497ca6b 100644 --- a/lib/src/model/extension.dart +++ b/lib/src/model/extension.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/element_type.dart'; import 'package:dartdoc/src/model/extension_target.dart'; diff --git a/lib/src/model/extension_target.dart b/lib/src/model/extension_target.dart index 19f5cc11e1..1785dea535 100644 --- a/lib/src/model/extension_target.dart +++ b/lib/src/model/extension_target.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; // TODO(jcollins-g): Mix-in ExtensionTarget on Method, ModelFunction, Typedef, diff --git a/lib/src/model/feature_set.dart b/lib/src/model/feature_set.dart index 65fb3f32eb..8a104170d0 100644 --- a/lib/src/model/feature_set.dart +++ b/lib/src/model/feature_set.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/language_feature.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/field.dart b/lib/src/model/field.dart index 456810595a..04824a444c 100644 --- a/lib/src/model/field.dart +++ b/lib/src/model/field.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:dartdoc/src/element_type.dart'; diff --git a/lib/src/model/getter_setter_combo.dart b/lib/src/model/getter_setter_combo.dart index d1cba5ca3b..574f2a2aad 100644 --- a/lib/src/model/getter_setter_combo.dart +++ b/lib/src/model/getter_setter_combo.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:convert'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/lib/src/model/indexable.dart b/lib/src/model/indexable.dart index 0e46d0d1fd..24d47da254 100644 --- a/lib/src/model/indexable.dart +++ b/lib/src/model/indexable.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; /// Something able to be indexed. diff --git a/lib/src/model/inheritable.dart b/lib/src/model/inheritable.dart index e741cd7e38..af63d467f7 100644 --- a/lib/src/model/inheritable.dart +++ b/lib/src/model/inheritable.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; import 'package:dartdoc/src/special_elements.dart'; diff --git a/lib/src/model/language_feature.dart b/lib/src/model/language_feature.dart index fcd866951d..33053f316e 100644 --- a/lib/src/model/language_feature.dart +++ b/lib/src/model/language_feature.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/render/feature_renderer.dart'; const Map _featureDescriptions = { diff --git a/lib/src/model/library.dart b/lib/src/model/library.dart index b7d677e6f0..4e57176847 100644 --- a/lib/src/model/library.dart +++ b/lib/src/model/library.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:collection'; import 'package:analyzer/dart/analysis/results.dart'; diff --git a/lib/src/model/library_container.dart b/lib/src/model/library_container.dart index 2a10757c4c..46c94593d5 100644 --- a/lib/src/model/library_container.dart +++ b/lib/src/model/library_container.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:collection/collection.dart'; import 'package:dartdoc/src/model/model.dart'; import 'package:dartdoc/src/model_utils.dart' as model_utils; diff --git a/lib/src/model/locatable.dart b/lib/src/model/locatable.dart index f140fb90ca..94d03d1ae0 100644 --- a/lib/src/model/locatable.dart +++ b/lib/src/model/locatable.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart' show Element; /// Something that can be located for warning purposes. diff --git a/lib/src/model/method.dart b/lib/src/model/method.dart index 1f69396926..22a805e743 100644 --- a/lib/src/model/method.dart +++ b/lib/src/model/method.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:analyzer/src/dart/element/member.dart' show Member; diff --git a/lib/src/model/mixin.dart b/lib/src/model/mixin.dart index 8f3663bf1e..6c7a289760 100644 --- a/lib/src/model/mixin.dart +++ b/lib/src/model/mixin.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; import 'package:dartdoc/src/element_type.dart'; diff --git a/lib/src/model/model.dart b/lib/src/model/model.dart index 34557bf9ef..9591fe6394 100644 --- a/lib/src/model/model.dart +++ b/lib/src/model/model.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + export 'accessor.dart'; export 'canonicalization.dart'; export 'categorization.dart'; diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart index 8c8b744b84..a2c395a0b6 100644 --- a/lib/src/model/model_element.dart +++ b/lib/src/model/model_element.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// The models used to represent Dart code. library dartdoc.models; diff --git a/lib/src/model/model_function.dart b/lib/src/model/model_function.dart index 68a1cdf52c..06345c6ac4 100644 --- a/lib/src/model/model_function.dart +++ b/lib/src/model/model_function.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/element_type.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/model_node.dart b/lib/src/model/model_node.dart index 45a3044c2e..1ab4c1f0b2 100644 --- a/lib/src/model/model_node.dart +++ b/lib/src/model/model_node.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/file_system/file_system.dart'; diff --git a/lib/src/model/nameable.dart b/lib/src/model/nameable.dart index 36ebc7f01d..c286901e5f 100644 --- a/lib/src/model/nameable.dart +++ b/lib/src/model/nameable.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:collection/collection.dart'; import 'locatable.dart'; diff --git a/lib/src/model/never.dart b/lib/src/model/never.dart index fcf056af65..76d278c589 100644 --- a/lib/src/model/never.dart +++ b/lib/src/model/never.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/operator.dart b/lib/src/model/operator.dart index d8e73abac8..4724365e7a 100644 --- a/lib/src/model/operator.dart +++ b/lib/src/model/operator.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/dart/element/member.dart' show Member; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/package.dart b/lib/src/model/package.dart index af1cd93a93..5c3564594d 100644 --- a/lib/src/model/package.dart +++ b/lib/src/model/package.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:dartdoc/src/dartdoc_options.dart'; diff --git a/lib/src/model/package_builder.dart b/lib/src/model/package_builder.dart index da9fd6f6f5..9d39afbdc0 100644 --- a/lib/src/model/package_builder.dart +++ b/lib/src/model/package_builder.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:async'; import 'package:analyzer/dart/analysis/analysis_context_collection.dart'; diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart index 2c4c7a41bb..0006e34def 100644 --- a/lib/src/model/package_graph.dart +++ b/lib/src/model/package_graph.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:collection'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/lib/src/model/parameter.dart b/lib/src/model/parameter.dart index e57e00d37d..45a663dad5 100644 --- a/lib/src/model/parameter.dart +++ b/lib/src/model/parameter.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/dart/element/member.dart' show Member; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/privacy.dart b/lib/src/model/privacy.dart index 9961eb0dda..0b00685aa7 100644 --- a/lib/src/model/privacy.dart +++ b/lib/src/model/privacy.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// Classes implementing this have a public/private distinction. abstract class Privacy { bool get isPublic; diff --git a/lib/src/model/source_code_mixin.dart b/lib/src/model/source_code_mixin.dart index 1c09f98d13..c36b5cb244 100644 --- a/lib/src/model/source_code_mixin.dart +++ b/lib/src/model/source_code_mixin.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/top_level_container.dart b/lib/src/model/top_level_container.dart index e81747580d..21ad66e8a5 100644 --- a/lib/src/model/top_level_container.dart +++ b/lib/src/model/top_level_container.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model.dart'; import 'package:dartdoc/src/model_utils.dart' as model_utils; diff --git a/lib/src/model/top_level_variable.dart b/lib/src/model/top_level_variable.dart index 8bc611f4b8..d4df888ede 100644 --- a/lib/src/model/top_level_variable.dart +++ b/lib/src/model/top_level_variable.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/element_type.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/type_parameter.dart b/lib/src/model/type_parameter.dart index 9e2fe431fc..0e78331e06 100644 --- a/lib/src/model/type_parameter.dart +++ b/lib/src/model/type_parameter.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/element_type.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model/typedef.dart b/lib/src/model/typedef.dart index 3be07634b2..f11adb74d9 100644 --- a/lib/src/model/typedef.dart +++ b/lib/src/model/typedef.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:dartdoc/src/element_type.dart'; import 'package:dartdoc/src/model/model.dart'; diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart index 521344da85..85704ecb21 100644 --- a/lib/src/model_utils.dart +++ b/lib/src/model_utils.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.model_utils; import 'dart:convert'; diff --git a/lib/src/mustachio/annotations.dart b/lib/src/mustachio/annotations.dart index d101fd182b..38cd3ad975 100644 --- a/lib/src/mustachio/annotations.dart +++ b/lib/src/mustachio/annotations.dart @@ -1,5 +1,8 @@ /// Specifies information for generating a Mustache renderer for a [context] /// object, using a Mustache template at [templateUri] + +// @dart=2.9 + class Renderer { /// The name of the render function to generate. final Symbol name; diff --git a/lib/src/mustachio/parser.dart b/lib/src/mustachio/parser.dart index dfa6c26919..75ac46567a 100644 --- a/lib/src/mustachio/parser.dart +++ b/lib/src/mustachio/parser.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:charcode/charcode.dart'; import 'package:meta/meta.dart'; diff --git a/lib/src/mustachio/renderer_base.dart b/lib/src/mustachio/renderer_base.dart index 22bd36c0e1..04ef1850ba 100644 --- a/lib/src/mustachio/renderer_base.dart +++ b/lib/src/mustachio/renderer_base.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:collection'; import 'package:analyzer/file_system/file_system.dart'; diff --git a/lib/src/package_config_provider.dart b/lib/src/package_config_provider.dart index f82922ce0c..61a0a50116 100644 --- a/lib/src/package_config_provider.dart +++ b/lib/src/package_config_provider.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:io' as io; import 'package:analyzer/file_system/file_system.dart'; diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart index 8c87ca59d5..07402c6d14 100644 --- a/lib/src/package_meta.dart +++ b/lib/src/package_meta.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.package_meta; import 'dart:convert'; diff --git a/lib/src/quiver.dart b/lib/src/quiver.dart index dd36843303..4e79c2883d 100644 --- a/lib/src/quiver.dart +++ b/lib/src/quiver.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// Methods in-lined from package:quiver. // From lib/iterables.dart: diff --git a/lib/src/render/category_renderer.dart b/lib/src/render/category_renderer.dart index c51c417646..2d402ca968 100644 --- a/lib/src/render/category_renderer.dart +++ b/lib/src/render/category_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/category.dart'; abstract class CategoryRenderer { diff --git a/lib/src/render/documentation_renderer.dart b/lib/src/render/documentation_renderer.dart index 20758be7cc..df2f3aea08 100644 --- a/lib/src/render/documentation_renderer.dart +++ b/lib/src/render/documentation_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/tuple.dart'; import 'package:html/parser.dart' show parse; import 'package:markdown/markdown.dart' as md; diff --git a/lib/src/render/element_type_renderer.dart b/lib/src/render/element_type_renderer.dart index 66124adae5..0b6c81fcf0 100644 --- a/lib/src/render/element_type_renderer.dart +++ b/lib/src/render/element_type_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/dartdoc.dart'; import 'package:dartdoc/src/render/parameter_renderer.dart'; diff --git a/lib/src/render/enum_field_renderer.dart b/lib/src/render/enum_field_renderer.dart index c3ccf13e83..162575ed2a 100644 --- a/lib/src/render/enum_field_renderer.dart +++ b/lib/src/render/enum_field_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/enum.dart'; abstract class EnumFieldRenderer { diff --git a/lib/src/render/feature_renderer.dart b/lib/src/render/feature_renderer.dart index a55091a740..4287da931a 100644 --- a/lib/src/render/feature_renderer.dart +++ b/lib/src/render/feature_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/language_feature.dart'; abstract class FeatureRenderer { diff --git a/lib/src/render/model_element_renderer.dart b/lib/src/render/model_element_renderer.dart index d7755d4851..c8d7c141b7 100644 --- a/lib/src/render/model_element_renderer.dart +++ b/lib/src/render/model_element_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/model_element.dart'; abstract class ModelElementRenderer { diff --git a/lib/src/render/parameter_renderer.dart b/lib/src/render/parameter_renderer.dart index dd1a2f7283..cdc99fab92 100644 --- a/lib/src/render/parameter_renderer.dart +++ b/lib/src/render/parameter_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:convert'; import 'package:analyzer/dart/element/type.dart'; diff --git a/lib/src/render/renderer_factory.dart b/lib/src/render/renderer_factory.dart index 9dcef0fa16..9608b14b13 100644 --- a/lib/src/render/renderer_factory.dart +++ b/lib/src/render/renderer_factory.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/dartdoc.dart'; import 'package:dartdoc/src/render/category_renderer.dart'; import 'package:dartdoc/src/render/documentation_renderer.dart'; diff --git a/lib/src/render/source_code_renderer.dart b/lib/src/render/source_code_renderer.dart index 82e4d56150..04c7b06dd5 100644 --- a/lib/src/render/source_code_renderer.dart +++ b/lib/src/render/source_code_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:convert'; /// Renderer for source code snippets extracted from source files. diff --git a/lib/src/render/template_renderer.dart b/lib/src/render/template_renderer.dart index e18ab4ac41..ecb0a31eb5 100644 --- a/lib/src/render/template_renderer.dart +++ b/lib/src/render/template_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + abstract class TemplateRenderer { String composeLayoutTitle(String name, String kind, bool isDeprecated); } diff --git a/lib/src/render/type_parameters_renderer.dart b/lib/src/render/type_parameters_renderer.dart index b99f0e612e..652a4a62a1 100644 --- a/lib/src/render/type_parameters_renderer.dart +++ b/lib/src/render/type_parameters_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/type_parameter.dart'; abstract class TypeParametersRenderer { diff --git a/lib/src/render/typedef_renderer.dart b/lib/src/render/typedef_renderer.dart index bfe0175914..3607bf26b6 100644 --- a/lib/src/render/typedef_renderer.dart +++ b/lib/src/render/typedef_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/model/typedef.dart'; abstract class TypedefRenderer { diff --git a/lib/src/source_linker.dart b/lib/src/source_linker.dart index 26d07329c5..5fc2313ce1 100644 --- a/lib/src/source_linker.dart +++ b/lib/src/source_linker.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// A library for getting external source code links for Dartdoc. library dartdoc.source_linker; diff --git a/lib/src/special_elements.dart b/lib/src/special_elements.dart index 028f665864..aa6324e12d 100644 --- a/lib/src/special_elements.dart +++ b/lib/src/special_elements.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// Handling for special elements within Dart. When identified these /// may alter the interpretation and documentation generated for other /// [ModelElement]s. diff --git a/lib/src/tool_runner.dart b/lib/src/tool_runner.dart index 0e8acf143a..510a50686d 100644 --- a/lib/src/tool_runner.dart +++ b/lib/src/tool_runner.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.tool_runner; import 'dart:io' show Process, ProcessException; diff --git a/lib/src/tuple.dart b/lib/src/tuple.dart index e4e1dfe926..a0655e03b8 100644 --- a/lib/src/tuple.dart +++ b/lib/src/tuple.dart @@ -1,5 +1,7 @@ // Copied from source at github.com/kseo/tuple/blob/470ed3aeb/lib/src/tuple.dart +// @dart=2.9 + // Original copyright: // Copyright (c) 2014, the tuple project authors. Please see the AUTHORS // file for details. All rights reserved. Use of this source code is governed diff --git a/lib/src/utils.dart b/lib/src/utils.dart index f898968566..fe6ad200ee 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -1,6 +1,9 @@ // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. + +// @dart=2.9 + library dartdoc.utils; final RegExp leadingWhiteSpace = RegExp(r'^([ \t]*)[^ ]'); diff --git a/lib/src/version.dart b/lib/src/version.dart index c19287d486..b50e65c6bf 100644 --- a/lib/src/version.dart +++ b/lib/src/version.dart @@ -1,2 +1,5 @@ // Generated code. Do not modify. + +// @dart=2.9 + const packageVersion = '0.39.0'; diff --git a/lib/src/warnings.dart b/lib/src/warnings.dart index 718adb26e6..8c76a0186b 100644 --- a/lib/src/warnings.dart +++ b/lib/src/warnings.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:dartdoc/src/dartdoc_options.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 5aeb5f617b..757c61480d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,13 +4,13 @@ version: 0.39.0 description: A non-interactive HTML documentation generator for Dart source code. homepage: https://github.com/dart-lang/dartdoc environment: - sdk: '>=2.10.0 <3.0.0' + sdk: '>=2.12.0-0 <3.0.0' dependencies: analyzer: ^0.41.1 - args: '>=1.5.0 <2.0.0' + args: '>=2.0.0-nullsafety.0' charcode: ^1.1.2 - collection: ^1.2.0 + collection: ^1.15.0-nullsafety.4 cli_util: '>=0.1.4 <0.3.0' crypto: ^2.0.6 glob: '>=1.1.2 <2.0.0' @@ -22,7 +22,7 @@ dependencies: package_config: '>=0.1.5 <2.0.0' path: ^1.3.0 pub_semver: ^1.3.7 - yaml: ^2.1.0 + yaml: ^3.0.0-nullsafety.0 dev_dependencies: async: '>=2.0.8' diff --git a/test/dartdoc_options_test.dart b/test/dartdoc_options_test.dart index 0a7b1cb5d3..e969dfbfaa 100644 --- a/test/dartdoc_options_test.dart +++ b/test/dartdoc_options_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.options_test; import 'package:analyzer/file_system/file_system.dart'; diff --git a/test/documentation_comment_test.dart b/test/documentation_comment_test.dart index 4a2e3ed32a..564142577b 100644 --- a/test/documentation_comment_test.dart +++ b/test/documentation_comment_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/memory_file_system.dart'; import 'package:analyzer/src/test_utilities/mock_sdk.dart'; diff --git a/test/end2end/dartdoc_integration_test.dart b/test/end2end/dartdoc_integration_test.dart index 841e631f66..16774880f9 100644 --- a/test/end2end/dartdoc_integration_test.dart +++ b/test/end2end/dartdoc_integration_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.dartdoc_integration_test; import 'dart:async'; diff --git a/test/end2end/dartdoc_test.dart b/test/end2end/dartdoc_test.dart index 2e83fa242b..f58f4f821f 100644 --- a/test/end2end/dartdoc_test.dart +++ b/test/end2end/dartdoc_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.dartdoc_test; import 'dart:async'; diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart index e6f2114025..db79232b9f 100644 --- a/test/end2end/model_special_cases_test.dart +++ b/test/end2end/model_special_cases_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// This test library handles checks against the model for configurations /// that require different PackageGraph configurations. Since those /// take a long time to initialize, isolate them here to keep model_test diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart index 4db049d979..1b8b2920b8 100644 --- a/test/end2end/model_test.dart +++ b/test/end2end/model_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.model_test; import 'dart:io'; diff --git a/test/grind_test.dart b/test/grind_test.dart index 23087548cb..154cc7f3f5 100644 --- a/test/grind_test.dart +++ b/test/grind_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.io_utils_test; import 'package:test/test.dart'; diff --git a/test/html_generator_test.dart b/test/html_generator_test.dart index 969ca43819..b6a5773f25 100644 --- a/test/html_generator_test.dart +++ b/test/html_generator_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/memory_file_system.dart'; import 'package:dartdoc/dartdoc.dart'; diff --git a/test/io_utils_test.dart b/test/io_utils_test.dart index d22c95d9bf..241e348a69 100644 --- a/test/io_utils_test.dart +++ b/test/io_utils_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.io_utils_test; import 'package:dartdoc/src/io_utils.dart'; diff --git a/test/library_test.dart b/test/library_test.dart index 256abdab35..39fc7e8a12 100644 --- a/test/library_test.dart +++ b/test/library_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/file_system/file_system.dart'; import 'package:dartdoc/src/model/model.dart'; import 'package:dartdoc/src/package_config_provider.dart'; diff --git a/test/markdown_processor_test.dart b/test/markdown_processor_test.dart index 61a900bad2..9a5dce0a83 100644 --- a/test/markdown_processor_test.dart +++ b/test/markdown_processor_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.markdown_processor_test; import 'package:dartdoc/src/markdown_processor.dart'; diff --git a/test/model_utils_test.dart b/test/model_utils_test.dart index 850c2d4901..1705a51362 100644 --- a/test/model_utils_test.dart +++ b/test/model_utils_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.model_utils_test; import 'package:dartdoc/src/model_utils.dart'; diff --git a/test/mustachio/builder_test.dart b/test/mustachio/builder_test.dart index 0dcf6a8374..24349955b3 100644 --- a/test/mustachio/builder_test.dart +++ b/test/mustachio/builder_test.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + import 'dart:convert'; import 'package:analyzer/dart/element/element.dart'; import 'package:build/build.dart'; diff --git a/test/mustachio/foo.dart b/test/mustachio/foo.dart index 777f56d2da..6e6b2b57fc 100644 --- a/test/mustachio/foo.dart +++ b/test/mustachio/foo.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + @Renderer(#renderFoo, Context()) @Renderer(#renderBar, Context()) @Renderer(#renderBaz, Context()) diff --git a/test/mustachio/foo.renderers.dart b/test/mustachio/foo.renderers.dart index b9fa51794c..159ff1afc5 100644 --- a/test/mustachio/foo.renderers.dart +++ b/test/mustachio/foo.renderers.dart @@ -3,6 +3,8 @@ // To change the contents of this library, make changes to the builder source // files in the tool/mustachio/ directory. +// @dart=2.9 + // ignore_for_file: camel_case_types, unnecessary_cast, unused_element, unused_import import 'package:analyzer/file_system/file_system.dart'; import 'package:dartdoc/src/generator/template_data.dart'; diff --git a/test/mustachio/parser_test.dart b/test/mustachio/parser_test.dart index dc56440fe8..fbfd184c0f 100644 --- a/test/mustachio/parser_test.dart +++ b/test/mustachio/parser_test.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + import 'package:dartdoc/src/mustachio/parser.dart'; import 'package:test/test.dart'; diff --git a/test/mustachio/renderer_test.dart b/test/mustachio/renderer_test.dart index 7d3416c226..cca264e2c4 100644 --- a/test/mustachio/renderer_test.dart +++ b/test/mustachio/renderer_test.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/memory_file_system.dart'; import 'package:dartdoc/src/mustachio/renderer_base.dart'; diff --git a/test/package_meta_test.dart b/test/package_meta_test.dart index 7339818a90..3c1c262097 100644 --- a/test/package_meta_test.dart +++ b/test/package_meta_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.package_utils_test; import 'package:dartdoc/src/io_utils.dart'; diff --git a/test/package_test.dart b/test/package_test.dart index 8321766c88..43ade7c114 100644 --- a/test/package_test.dart +++ b/test/package_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/memory_file_system.dart'; import 'package:dartdoc/src/dartdoc_options.dart'; diff --git a/test/quiver_test.dart b/test/quiver_test.dart index 4e59f6f6f5..512095f978 100644 --- a/test/quiver_test.dart +++ b/test/quiver_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:test/test.dart'; import 'package:dartdoc/src/quiver.dart'; diff --git a/test/render/template_renderer_test.dart b/test/render/template_renderer_test.dart index 1340143d46..8a3a6b7678 100644 --- a/test/render/template_renderer_test.dart +++ b/test/render/template_renderer_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'package:dartdoc/src/render/template_renderer.dart'; import 'package:test/test.dart'; diff --git a/test/resource_loader_test.dart b/test/resource_loader_test.dart index aa915ba123..2962f71ba9 100644 --- a/test/resource_loader_test.dart +++ b/test/resource_loader_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.resource_loader_test; import 'package:analyzer/file_system/file_system.dart'; diff --git a/test/source_linker_test.dart b/test/source_linker_test.dart index 7c68a8d96b..adc591e34a 100644 --- a/test/source_linker_test.dart +++ b/test/source_linker_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.source_linker_test; import 'package:dartdoc/src/dartdoc_options.dart'; diff --git a/test/src/utils.dart b/test/src/utils.dart index 9de5eb3d61..de2d92e9f9 100644 --- a/test/src/utils.dart +++ b/test/src/utils.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library test_utils; import 'package:analyzer/file_system/file_system.dart'; diff --git a/test/template_test.dart b/test/template_test.dart index b09f0ea9c2..9e98e11624 100644 --- a/test/template_test.dart +++ b/test/template_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.template_test; import 'dart:io'; diff --git a/test/tool_runner_test.dart b/test/tool_runner_test.dart index 34ac28a5d5..1b0cc76a27 100644 --- a/test/tool_runner_test.dart +++ b/test/tool_runner_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.model_test; import 'dart:io'; diff --git a/test/utils_test.dart b/test/utils_test.dart index 7cef778fa6..8ea58d225d 100644 --- a/test/utils_test.dart +++ b/test/utils_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + library dartdoc.utils_test; import 'package:dartdoc/src/utils.dart'; diff --git a/test/warnings_test.dart b/test/warnings_test.dart index b4db31ee41..6f63e6b497 100644 --- a/test/warnings_test.dart +++ b/test/warnings_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// Unit tests for lib/src/warnings.dart. library dartdoc.warnings_test; diff --git a/tool/builder.dart b/tool/builder.dart index d77d109653..6a53d9d019 100644 --- a/tool/builder.dart +++ b/tool/builder.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:async'; import 'package:build/build.dart'; diff --git a/tool/doc_packages.dart b/tool/doc_packages.dart index 5112d87578..124b6b692f 100644 --- a/tool/doc_packages.dart +++ b/tool/doc_packages.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + /// A CLI tool to generate documentation for packages from pub.dartlang.org. library dartdoc.doc_packages; diff --git a/tool/grind.dart b/tool/grind.dart index 43fa69e400..a12fec3a62 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:async'; import 'dart:io' hide ProcessException; diff --git a/tool/mustachio/builder.dart b/tool/mustachio/builder.dart index dd9fd0c960..5d2cf1ce0d 100644 --- a/tool/mustachio/builder.dart +++ b/tool/mustachio/builder.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/dart/element/member.dart'; import 'package:build/build.dart'; diff --git a/tool/mustachio/codegen_runtime_renderer.dart b/tool/mustachio/codegen_runtime_renderer.dart index 9e85bd56f1..c33174e767 100644 --- a/tool/mustachio/codegen_runtime_renderer.dart +++ b/tool/mustachio/codegen_runtime_renderer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:collection'; import 'package:analyzer/dart/element/element.dart'; diff --git a/tool/subprocess_launcher.dart b/tool/subprocess_launcher.dart index 9c9ac5d64f..e5090649bb 100644 --- a/tool/subprocess_launcher.dart +++ b/tool/subprocess_launcher.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// @dart=2.9 + import 'dart:async'; import 'dart:convert'; import 'dart:io'; From a08c4ae375a6000de1bb51ec2f419e43e9a90a82 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 2 Feb 2021 11:48:14 -0800 Subject: [PATCH 2/6] tweaks to pubspec --- pubspec.yaml | 19 +++++++++---------- tool/grind.dart | 7 ++++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 757c61480d..2612948ad7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ environment: dependencies: analyzer: ^0.41.1 - args: '>=2.0.0-nullsafety.0' + args: '<=2.0.0-nullsafety.0' charcode: ^1.1.2 collection: ^1.15.0-nullsafety.4 cli_util: '>=0.1.4 <0.3.0' @@ -16,23 +16,22 @@ dependencies: glob: '>=1.1.2 <2.0.0' html: '>=0.12.1 <0.15.0' logging: ^0.11.3+1 - markdown: '>=2.1.5 <4.0.0' + markdown: '>=2.1.5 <=4.0.0-nullsafety.0' meta: ^1.2.4 mustache: ^1.1.0 package_config: '>=0.1.5 <2.0.0' path: ^1.3.0 - pub_semver: ^1.3.7 + pub_semver: ^2.0.0-nullsafety.0 yaml: ^3.0.0-nullsafety.0 dev_dependencies: async: '>=2.0.8' - build: ^1.5.0 - build_runner: ^1.10.0 - build_test: ^1.3.0 - build_version: ^2.0.1 - coverage: ^0.14.0 - dart_style: ^1.3.9 - dhttpd: ^3.0.0 + #build: ^1.5.0 + #build_runner: ^1.10.0 + #build_test: ^1.3.0 + #build_version: ^2.0.1 + #coverage: ^0.15.0 + #dart_style: ^1.3.9 grinder: ^0.8.2 http: ^0.12.0 pedantic: ^1.9.0 diff --git a/tool/grind.dart b/tool/grind.dart index a12fec3a62..22d63e4c7e 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -600,6 +600,7 @@ Future startTestPackageDocsServer() async { log('launching dhttpd on port 8002 for SDK'); var launcher = SubprocessLauncher('serve-test-package-docs'); await launcher.runStreamed(sdkBin('pub'), [ + 'global', 'run', 'dhttpd', '--port', @@ -620,7 +621,7 @@ Future _serveDocsFrom(String servePath, int port, String context) async { _serveReady = true; } await launcher.runStreamed( - sdkBin('pub'), ['run', 'dhttpd', '--port', '$port', '--path', servePath]); + sdkBin('pub'), ['global', 'run', 'dhttpd', '--port', '$port', '--path', servePath]); } @Task('Serve generated SDK docs locally with dhttpd on port 8000') @@ -629,6 +630,7 @@ Future serveSdkDocs() async { log('launching dhttpd on port 8000 for SDK'); var launcher = SubprocessLauncher('serve-sdk-docs'); await launcher.runStreamed(sdkBin('pub'), [ + 'global', 'run', 'dhttpd', '--port', @@ -670,6 +672,7 @@ Future compareFlutterWarnings() async { var launcher = SubprocessLauncher('serve-flutter-docs'); await launcher.runStreamed(sdkBin('pub'), ['get']); Future original = launcher.runStreamed(sdkBin('pub'), [ + 'global', 'run', 'dhttpd', '--port', @@ -678,6 +681,7 @@ Future compareFlutterWarnings() async { path.join(originalDartdocFlutter.absolute.path, 'dev', 'docs', 'doc'), ]); Future current = launcher.runStreamed(sdkBin('pub'), [ + 'global', 'run', 'dhttpd', '--port', @@ -696,6 +700,7 @@ Future serveFlutterDocs() async { var launcher = SubprocessLauncher('serve-flutter-docs'); await launcher.runStreamed(sdkBin('pub'), ['get']); await launcher.runStreamed(sdkBin('pub'), [ + 'global', 'run', 'dhttpd', '--port', From 0cc208a40f88a0b1841cfacee04e76f381258e9b Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 2 Feb 2021 13:06:53 -0800 Subject: [PATCH 3/6] reset dartdoc deps and use overrides --- pubspec.yaml | 22 +++++++++++----------- tool/grind.dart | 5 +++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 2612948ad7..66be12c2b3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,30 +8,30 @@ environment: dependencies: analyzer: ^0.41.1 - args: '<=2.0.0-nullsafety.0' + args: '>=1.5.0 <2.0.0' charcode: ^1.1.2 - collection: ^1.15.0-nullsafety.4 + collection: ^1.2.0 cli_util: '>=0.1.4 <0.3.0' crypto: ^2.0.6 glob: '>=1.1.2 <2.0.0' html: '>=0.12.1 <0.15.0' logging: ^0.11.3+1 - markdown: '>=2.1.5 <=4.0.0-nullsafety.0' + markdown: '>=2.1.5 <4.0.0' meta: ^1.2.4 mustache: ^1.1.0 package_config: '>=0.1.5 <2.0.0' path: ^1.3.0 - pub_semver: ^2.0.0-nullsafety.0 - yaml: ^3.0.0-nullsafety.0 + pub_semver: ^1.3.7 + yaml: ^2.1.0 dev_dependencies: async: '>=2.0.8' - #build: ^1.5.0 - #build_runner: ^1.10.0 - #build_test: ^1.3.0 - #build_version: ^2.0.1 - #coverage: ^0.15.0 - #dart_style: ^1.3.9 + build: ^1.5.0 + build_runner: ^1.10.0 + build_test: ^1.3.0 + build_version: ^2.0.1 + coverage: ^0.14.0 + dart_style: ^1.3.9 grinder: ^0.8.2 http: ^0.12.0 pedantic: ^1.9.0 diff --git a/tool/grind.dart b/tool/grind.dart index 22d63e4c7e..22961dfb21 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -472,6 +472,11 @@ Future createSdkDartdoc(bool overrideMeta) async { dartdocPubspec.writeAsStringSync(''' dependency_overrides: + args: ^2.0.0-nullsafety.0 + cli_util: ^0.3.0-nullsafety.0 + crypto: ^3.0.0-nullsafety.0 + glob: ^2.0.0-nullsafety.0 + package_config: ^2.0.0-nullsafety.0 analyzer: path: '${sdkClone.path}/pkg/analyzer' _fe_analyzer_shared: From 0aec2109f534fe26712fa69eaf4978cb32f06b13 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 2 Feb 2021 13:17:35 -0800 Subject: [PATCH 4/6] add more overrides --- tool/grind.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tool/grind.dart b/tool/grind.dart index 22961dfb21..59a536dc33 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -477,6 +477,8 @@ dependency_overrides: crypto: ^3.0.0-nullsafety.0 glob: ^2.0.0-nullsafety.0 package_config: ^2.0.0-nullsafety.0 + pub_semver: ^2.0.0-nullsafety.0 + yaml: ^3.0.0-nullsafety.0 analyzer: path: '${sdkClone.path}/pkg/analyzer' _fe_analyzer_shared: From 5f83795dff6a0b0c35eeda41269a7485dc32e011 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 2 Feb 2021 13:49:11 -0800 Subject: [PATCH 5/6] Add the sdk-analyzer back again --- .github/workflows/test.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4916a66e16..a6402cde72 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -20,8 +20,7 @@ jobs: matrix: os: [ubuntu-latest] sdk: [dev, stable] - # Add sdk-analyzer once #2500 is addressed - job: [main, flutter, packages, sdk-docs] + job: [main, flutter, sdk-analyzer, packages, sdk-docs] include: - os: macos-latest sdk: dev From 5e1fa7cd118572976101a3cd51b90a917a894d14 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 2 Feb 2021 13:51:13 -0800 Subject: [PATCH 6/6] remove stable --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a6402cde72..58111dfb39 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -19,7 +19,8 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - sdk: [dev, stable] + # Add stable back in after 2.12 is published. + sdk: [dev] job: [main, flutter, sdk-analyzer, packages, sdk-docs] include: - os: macos-latest