From 7cb45156a6ae9a654b07515126d44d8b2821b2b7 Mon Sep 17 00:00:00 2001 From: wangliang Date: Mon, 30 Dec 2024 17:17:30 +0800 Subject: [PATCH 1/2] upgrade to support latest flutter version --- lib/src/builders/mermaid_builder.dart | 8 +- lib/src/builders/nomnoml_builder.dart | 7 +- lib/src/class_element_collector.dart | 8 +- pubspec.lock | 275 +++++++++++++++---------- pubspec.yaml | 12 +- test/fixtures/exports/pubspec.lock | 133 ++++++------ test/fixtures/exports/pubspec.yaml | 2 +- test/fixtures/inheritance/pubspec.lock | 126 ++++++----- 8 files changed, 328 insertions(+), 243 deletions(-) diff --git a/lib/src/builders/mermaid_builder.dart b/lib/src/builders/mermaid_builder.dart index 04eb29f..274dbf3 100644 --- a/lib/src/builders/mermaid_builder.dart +++ b/lib/src/builders/mermaid_builder.dart @@ -38,8 +38,7 @@ class MermaidBuilder implements DiagramBuilder { rightBracket: '~', stripParens: true, ); - _lines.add( - '$_currentClass : $visibilityPrefix$name$staticSuffix$abstractSuffix $type'); + _lines.add('$_currentClass : $visibilityPrefix$name$staticSuffix$abstractSuffix $type'); } @override @@ -56,8 +55,7 @@ class MermaidBuilder implements DiagramBuilder { final abstractSuffix = element.isAbstract ? '*' : ''; final name = element.name; final type = element.returnType.getDisplayString(withNullability: true); - _lines.add( - '$_currentClass : $visibilityPrefix$name()$staticSuffix$abstractSuffix $type'); + _lines.add('$_currentClass : $visibilityPrefix$name()$staticSuffix$abstractSuffix $type'); } @override @@ -81,7 +79,7 @@ class MermaidBuilder implements DiagramBuilder { if (element.isAbstract) { _lines.add('<> $_currentClass'); } - if (element.isEnum) { + if (element.isDartCoreEnum) { _lines.add('<> $_currentClass'); } } diff --git a/lib/src/builders/nomnoml_builder.dart b/lib/src/builders/nomnoml_builder.dart index 7ecfd98..e3ea998 100644 --- a/lib/src/builders/nomnoml_builder.dart +++ b/lib/src/builders/nomnoml_builder.dart @@ -106,14 +106,13 @@ class NomnomlBuilder implements DiagramBuilder { final visibilityPrefix = getVisibility(element); final staticPrefix = element.isStatic ? '' : ''; final methodName = element.name; - final methodType = - element.returnType.getDisplayString(withNullability: true); + final methodType = element.returnType.getDisplayString(withNullability: true); return ' $staticPrefix$visibilityPrefix$methodType $methodName()'; }).join(';\n')); } - String fullClassName(ClassElement element) { - final abstractModifier = element.isAbstract ? '' : ''; + String fullClassName(InterfaceElement element) { + final abstractModifier = ''; final className = typeName(element, withNullability: false); return '$abstractModifier$className'; } diff --git a/lib/src/class_element_collector.dart b/lib/src/class_element_collector.dart index 9687745..c439dff 100644 --- a/lib/src/class_element_collector.dart +++ b/lib/src/class_element_collector.dart @@ -25,7 +25,7 @@ class ClassElementCollector extends RecursiveElementVisitor { } @override - void visitExportElement(ExportElement element) { + void visitLibraryExportElement(LibraryExportElement element) { if (!_exportOnly) { return; } @@ -53,10 +53,8 @@ class ClassElementCollector extends RecursiveElementVisitor { return true; } - final shouldShow = - _shownNames.isNotEmpty && _shownNames.contains(element.name); - final shouldHide = - _hiddenNames.isNotEmpty && _hiddenNames.contains(element.name); + final shouldShow = _shownNames.isNotEmpty && _shownNames.contains(element.name); + final shouldHide = _hiddenNames.isNotEmpty && _hiddenNames.contains(element.name); return _exportOnly ? (shouldShow && !shouldHide) : true; } diff --git a/pubspec.lock b/pubspec.lock index 0ce86b5..eee3f53 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,337 +5,398 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "29.0.0" + version: "68.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.1.0" analyzer: dependency: "direct main" description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.6.0" + version: "6.5.0" args: dependency: "direct main" description: name: args - url: "https://pub.dartlang.org" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.3.0" + version: "2.6.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.8.2" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.3.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.5" + version: "2.1.2" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.15.0" + version: "1.19.1" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.0.1" + version: "3.1.2" coverage: dependency: transitive description: name: coverage - url: "https://pub.dartlang.org" + sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.3" + version: "1.11.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.0.1" + version: "3.0.6" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "6.1.2" + version: "7.0.1" frontend_server_client: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.1.2" + version: "4.0.0" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.2" + version: "2.1.2" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.0.1" + version: "3.2.2" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "4.0.0" + version: "4.1.1" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.3" + version: "1.0.5" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "0.6.3" + version: "0.7.1" lints: dependency: "direct dev" description: name: lints - url: "https://pub.dartlang.org" + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.1" + version: "4.0.0" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.2" + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "12e8a9842b5a7390de7a781ec63d793527582398d16ea26c60fed58833c9ae79" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" + source: hosted + version: "0.1.0-main.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "0.12.11" + version: "0.12.16+1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.7.0" + version: "1.16.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.1" + version: "2.0.0" node_preamble: dependency: transitive description: name: node_preamble - url: "https://pub.dartlang.org" + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.1" + version: "2.0.2" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.2" + version: "2.1.1" path: dependency: "direct main" description: name: path - url: "https://pub.dartlang.org" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.8.0" + version: "1.9.1" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.5.0" + version: "1.5.1" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.1.0" + version: "2.1.5" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.2.0" + version: "1.4.2" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler - url: "https://pub.dartlang.org" + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.0.0" + version: "3.0.2" shelf_static: dependency: transitive description: name: shelf_static - url: "https://pub.dartlang.org" + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.1.0" + version: "1.1.3" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.1" + version: "2.0.1" source_map_stack_trace: dependency: transitive description: name: source_map_stack_trace - url: "https://pub.dartlang.org" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.1.0" + version: "2.1.2" source_maps: dependency: transitive description: name: source_maps - url: "https://pub.dartlang.org" + sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "0.10.10" + version: "0.10.13" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.8.1" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.10.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.1.0" + version: "2.1.3" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.1.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.2.0" + version: "1.2.2" test: dependency: "direct dev" description: name: test - url: "https://pub.dartlang.org" + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.18.2" + version: "1.25.8" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "0.4.5" + version: "0.7.3" test_core: dependency: transitive description: name: test_core - url: "https://pub.dartlang.org" + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "0.4.5" + version: "0.6.5" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.3.0" + version: "1.3.2" vm_service: dependency: transitive description: name: vm_service - url: "https://pub.dartlang.org" + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "7.3.0" + version: "14.3.1" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.1" + version: "1.1.1" + web: + dependency: transitive + description: + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" + source: hosted + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" + source: hosted + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.1.0" + version: "3.0.1" webkit_inspection_protocol: dependency: transitive description: name: webkit_inspection_protocol - url: "https://pub.dartlang.org" + sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.0" + version: "1.2.1" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.1.0" + version: "3.1.3" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=3.4.0 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 8cf2f0e..50d7a07 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,14 +6,14 @@ executables: dcdg: environment: - sdk: '>=2.14.0 <3.0.0' + sdk: '>=2.18.0 <4.0.0' dependencies: - analyzer: ^2.6.0 - args: ^2.0.0 - path: ^1.4.0 + analyzer: ^6.5.0 + args: ^2.6.0 + path: ^1.9.1 dev_dependencies: - lints: ^1.0.0 - test: ^1.0.0 + lints: ^4.0.0 + test: ^1.25.8 diff --git a/test/fixtures/exports/pubspec.lock b/test/fixtures/exports/pubspec.lock index 69057e8..2d5bccc 100644 --- a/test/fixtures/exports/pubspec.lock +++ b/test/fixtures/exports/pubspec.lock @@ -5,162 +5,173 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "29.0.0" + version: "68.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.1.0" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.6.0" + version: "6.5.0" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.0" + version: "2.6.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.5.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.2.0" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0" + version: "2.12.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.15.0" + version: "1.19.1" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.0.0" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.0.0" + version: "3.0.6" dcdg: dependency: "direct dev" description: path: "../../.." relative: true source: path - version: "4.0.1" + version: "4.1.0" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "6.1.0" + version: "7.0.1" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" + source: hosted + version: "2.1.2" + macros: + dependency: transitive + description: + name: macros + sha256: "12e8a9842b5a7390de7a781ec63d793527582398d16ea26c60fed58833c9ae79" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.0" + version: "0.1.0-main.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.7.0" + version: "1.16.0" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.0" + version: "2.1.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.11.0" + version: "1.9.1" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.0" + version: "2.1.5" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.8.1" + version: "1.10.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.1.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.2.0" + version: "1.2.2" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.3.0" + version: "1.3.2" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.0" + version: "1.1.1" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.1.0" + version: "3.1.3" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=3.4.0 <4.0.0" diff --git a/test/fixtures/exports/pubspec.yaml b/test/fixtures/exports/pubspec.yaml index 14b1d9b..54db7d3 100644 --- a/test/fixtures/exports/pubspec.yaml +++ b/test/fixtures/exports/pubspec.yaml @@ -1,7 +1,7 @@ name: exports_fixture description: A test fixture with exports environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.18.0 <4.0.0' dev_dependencies: dcdg: path: ../../../ diff --git a/test/fixtures/inheritance/pubspec.lock b/test/fixtures/inheritance/pubspec.lock index 28c8123..ac9f5fd 100644 --- a/test/fixtures/inheritance/pubspec.lock +++ b/test/fixtures/inheritance/pubspec.lock @@ -5,114 +5,126 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "31.0.0" + version: "68.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.1.0" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.8.0" + version: "6.5.0" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.3.0" + version: "2.6.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.8.2" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "0.3.5" + version: "2.12.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.15.0" + version: "1.19.1" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.0.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.0.1" + version: "3.0.6" dcdg: dependency: "direct dev" description: path: "../../.." relative: true source: path - version: "4.0.1" + version: "4.1.0" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "6.1.2" + version: "7.0.1" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" + source: hosted + version: "2.1.2" + macros: + dependency: transitive + description: + name: macros + sha256: "12e8a9842b5a7390de7a781ec63d793527582398d16ea26c60fed58833c9ae79" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.2" + version: "0.1.0-main.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.7.0" + version: "1.16.0" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.0.2" + version: "2.1.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.8.1" + version: "1.9.1" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "2.1.0" + version: "2.1.5" simple_fixture: dependency: "direct main" description: @@ -124,43 +136,49 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.8.1" + version: "1.10.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.1.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.2.0" + version: "1.2.2" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.3.0" + version: "1.3.2" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "1.0.1" + version: "1.1.1" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://packages.orbit.bmwgroup.net/artifactory/api/pub/mobile20-pub-virtual/" source: hosted - version: "3.1.0" + version: "3.1.3" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=3.4.0 <4.0.0" From 94e034c4ece385546ba28d1de7c8ae24b27d8746 Mon Sep 17 00:00:00 2001 From: wangliang <283175161@qq.com> Date: Mon, 30 Dec 2024 17:24:05 +0800 Subject: [PATCH 2/2] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 50d7a07..2250af4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dcdg description: A tool to automatically generate class diagrams (like UML) from a Dart package. -version: 4.1.0 +version: 4.2.0 homepage: https://github.com/glesica/dcdg.dart executables: dcdg: