diff --git a/lib/src/api/auth_response.dart b/lib/src/api/auth_response.dart index 5242e58..9d6a2f6 100644 --- a/lib/src/api/auth_response.dart +++ b/lib/src/api/auth_response.dart @@ -6,7 +6,7 @@ class AuthResponse { factory AuthResponse.parse(EndpointResponse response) { final auth = AuthResponse._internal(); - if (response.success == true) { + if (response.success) { auth.status = parseStatus(response.data['status'] as String? ?? AwaitLoginStatus.authFailed.toString()); @@ -19,10 +19,8 @@ class AuthResponse { ..organisationName = response.data['organisationName']! as String ..obfuscatedOrganisationId = response.data['obfuscatedOrganisationId']! as String; - break; case AwaitLoginStatus.retry: auth.pollInterval = response.data['pollInterval'] as int? ?? 3; - break; case AwaitLoginStatus.authFailed: throw ExitException(exitCode: 1, message: 'Authentication failed'); case AwaitLoginStatus.timeout: diff --git a/lib/src/my_runner.dart b/lib/src/my_runner.dart index ae6d598..d2a0001 100644 --- a/lib/src/my_runner.dart +++ b/lib/src/my_runner.dart @@ -52,7 +52,6 @@ class MyRunner extends CommandRunner implements PubTopLevel { switch (commandSet) { case CommandSet.onepub: onepubCommands(commandSet); - break; case CommandSet.opub: opubCommands(); } @@ -69,8 +68,8 @@ class MyRunner extends CommandRunner implements PubTopLevel { await Settings().setVerbose(enabled: results['debug'] as bool); - final version = results['version'] as bool == true; - if (version == true) { + final version = results['version'] as bool; + if (version) { // no output required as the startup logic already prints the version. exit(0); } diff --git a/lib/src/pub/solver/failure.dart b/lib/src/pub/solver/failure.dart index 7ccf7a8..f6d5ebe 100644 --- a/lib/src/pub/solver/failure.dart +++ b/lib/src/pub/solver/failure.dart @@ -110,7 +110,7 @@ class _Writer { // installed, if an SDK is incompatible with a dependency. final notices = _root.externalIncompatibilities .map((c) => c.cause.notice) - .whereNotNull() + .nonNulls .toSet() // Avoid duplicates .sortedBy((n) => n); // sort for consistency for (final n in notices) { @@ -158,7 +158,7 @@ class _Writer { // understand how to fix the issue. _root.externalIncompatibilities .map((c) => c.cause.hint) - .whereNotNull() + .nonNulls .toSet() // avoid duplicates .sortedBy((hint) => hint) // sort hints for consistent ordering. .forEach((hint) { diff --git a/lib/src/pub/source/git.dart b/lib/src/pub/source/git.dart index ee1aa54..a999bd2 100644 --- a/lib/src/pub/source/git.dart +++ b/lib/src/pub/source/git.dart @@ -5,7 +5,6 @@ import 'dart:async'; import 'dart:io'; -import 'package:collection/collection.dart' show IterableNullableExtension; import 'package:path/path.dart' as p; import 'package:pool/pool.dart'; import 'package:pub_semver/pub_semver.dart'; @@ -436,7 +435,7 @@ class GitSource extends CachedSource { } }); }) - .whereNotNull() + .nonNulls .toList(); // Note that there may be multiple packages with the same name and version diff --git a/lib/src/pub/source/hosted.dart b/lib/src/pub/source/hosted.dart index 7783f3d..19a851e 100644 --- a/lib/src/pub/source/hosted.dart +++ b/lib/src/pub/source/hosted.dart @@ -8,8 +8,7 @@ import 'dart:io' as io; import 'dart:io'; import 'dart:typed_data'; -import 'package:collection/collection.dart' - show IterableExtension, IterableNullableExtension, maxBy; +import 'package:collection/collection.dart' show IterableExtension, maxBy; import 'package:crypto/crypto.dart'; import 'package:http/http.dart' as http; import 'package:meta/meta.dart'; @@ -1057,7 +1056,7 @@ class HostedSource extends CachedSource { return null; } }) - .whereNotNull() + .nonNulls .toList(); } diff --git a/lib/src/pub/system_cache.dart b/lib/src/pub/system_cache.dart index b58cef8..ecd16ce 100644 --- a/lib/src/pub/system_cache.dart +++ b/lib/src/pub/system_cache.dart @@ -4,14 +4,13 @@ import 'dart:io'; -import 'package:collection/collection.dart'; import 'package:path/path.dart' as p; import 'package:pub_semver/pub_semver.dart'; import 'authentication/token_store.dart'; import 'exceptions.dart'; -import 'io.dart'; import 'io.dart' as io show createTempDir; +import 'io.dart'; import 'log.dart' as log; import 'package.dart'; import 'package_name.dart'; @@ -206,7 +205,7 @@ Consider setting the `PUB_CACHE` variable manually. return null; }), )) - .whereNotNull() + .nonNulls .toList(); return versions; diff --git a/lib/src/util/file_sync.dart b/lib/src/util/file_sync.dart index 82fa880..36326e9 100644 --- a/lib/src/util/file_sync.dart +++ b/lib/src/util/file_sync.dart @@ -82,7 +82,7 @@ class FileSync { line.write(char); priorChar = char; } - final endOfFile = line.isEmpty && foundDelimiter == false; + final endOfFile = line.isEmpty && !foundDelimiter; return endOfFile ? null : line.toString(); } diff --git a/lib/src/util/log.dart b/lib/src/util/log.dart index 49ed9bf..abb3a15 100644 --- a/lib/src/util/log.dart +++ b/lib/src/util/log.dart @@ -31,7 +31,7 @@ void _logout(String message) { final args = ParsedArgs(); var message0 = message; - if (args.colour == false) { + if (!args.colour) { message0 = Ansi.strip(message); } @@ -54,7 +54,7 @@ void _logerr(String message) { final args = ParsedArgs(); var message0 = message; - if (args.colour == false) { + if (!args.colour) { message0 = Ansi.strip(message); } diff --git a/lib/src/util/send_command.dart b/lib/src/util/send_command.dart index 79db08b..486f239 100644 --- a/lib/src/util/send_command.dart +++ b/lib/src/util/send_command.dart @@ -79,14 +79,12 @@ run: onepub login case Method.get: request = await client.getUrl(uri); _addHeaders(headers0, request); - break; case Method.post: request = await client.postUrl(uri); _addHeaders(headers0, request); if (body != null) { request.write(body); } - break; } final response = await request.close(); diff --git a/pubspec.lock b/pubspec.lock index 0ed5902..6bf7c2e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -2,34 +2,34 @@ # See https://dart.dev/tools/pub/glossary#lockfile packages: _fe_analyzer_shared: - dependency: "direct main" + dependency: transitive description: name: _fe_analyzer_shared - sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" + sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77" url: "https://pub.dev" source: hosted - version: "68.0.0" + version: "73.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.1.0" + version: "0.3.2" analyzer: dependency: "direct dev" description: name: analyzer - sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" + sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.8.0" archive: dependency: "direct main" description: name: archive - sha256: "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b" + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d url: "https://pub.dev" source: hosted - version: "3.6.0" + version: "3.6.1" args: dependency: "direct main" description: @@ -114,10 +114,10 @@ packages: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" convert: dependency: "direct main" description: @@ -130,10 +130,10 @@ packages: dependency: "direct main" description: name: coverage - sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e" + sha256: "576aaab8b1abdd452e0f656c3e73da9ead9d7880e15bdc494189d9c1a1baf0db" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.0" crypto: dependency: "direct main" description: @@ -162,42 +162,42 @@ packages: dependency: "direct dev" description: name: dcli - sha256: "12ef06b5b99d092eb37d9598dbc0a49807abac40390085afd2be11f604607705" + sha256: d3df6c340c2015159578655e94a87560098d5052e23f8b10403f2f31f715b8de url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "5.0.0" dcli_common: dependency: transitive description: name: dcli_common - sha256: c8af0ed248e67b7293cc7ca24a11cc6f3762009ce2a4d0d03c1368e6b0f15fb9 + sha256: d342b5eb461b0ce72fc7ccdb72b234456b3878fc26c37a8a1aef209eaaf089fa url: "https://pub.dev" source: hosted - version: "4.0.1-beta.4" + version: "5.0.0" dcli_core: dependency: "direct main" description: name: dcli_core - sha256: "915b6d7aa9cc039de4be263ecbdac0d372286059f5dba02a8b171748afb4883c" + sha256: "752baf94176d5b0e3100ec0c47d07e07f3590878ebf2b5a1e8e85fcde712b372" url: "https://pub.dev" source: hosted - version: "4.0.1-beta.4" + version: "5.0.0" dcli_input: dependency: "direct main" description: name: dcli_input - sha256: c3000b76a6680c3b225eec5daa4ca9ca92c02d18d490103839d6d3b8d6dadf93 + sha256: "399a36b7634764a09d04b4c022563a977f0be0d12add142f7079e6ae5f82d366" url: "https://pub.dev" source: hosted - version: "4.0.1-beta.4" + version: "5.0.0" dcli_terminal: dependency: "direct main" description: name: dcli_terminal - sha256: "5449d06b49966796237c5953abc8763dfbc3c29d180ba41f8e182d76c8379840" + sha256: "51d771ef5e8e15d739be6a235dad71132ec9397ef8fe3285a5570e66e699052b" url: "https://pub.dev" source: hosted - version: "4.0.1-beta.4" + version: "5.0.0" equatable: dependency: "direct main" description: @@ -266,10 +266,10 @@ packages: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_multi_server: dependency: "direct main" description: @@ -282,10 +282,10 @@ packages: dependency: "direct main" description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.0" ini: dependency: "direct main" description: @@ -338,10 +338,10 @@ packages: dependency: "direct dev" description: name: lint_hard - sha256: "44d15ec309b1a8e1aff99069df9dcb1597f49d5f588f32811ca28fb7b38c32fe" + sha256: "638d2cce6d3d5499826be71311d18cded797a51351eaa1aee7a35a2f0f9bc46e" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" lints: dependency: "direct dev" description: @@ -370,10 +370,10 @@ packages: dependency: transitive description: name: macros - sha256: "12e8a9842b5a7390de7a781ec63d793527582398d16ea26c60fed58833c9ae79" + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" url: "https://pub.dev" source: hosted - version: "0.1.0-main.0" + version: "0.1.2-main.4" matcher: dependency: "direct dev" description: @@ -398,14 +398,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - native_synchronization: + native_synchronization_temp: dependency: transitive description: - name: native_synchronization - sha256: ff200fe0a64d733ff7d4dde2005271c297db81007604c8cd21037959858133ab + name: native_synchronization_temp + sha256: "95ccdee4c0ab7440e7d86ef76af63013cc0c379485d5e0339a7b59de6e58091e" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.4.0" node_preamble: dependency: "direct main" description: @@ -502,46 +502,30 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.1" - runtime_named_locks: - dependency: transitive - description: - name: runtime_named_locks - sha256: "5fe859c1ddeeb595f6528596157191b628d85ba3137f0da327d92153604f2f6b" - url: "https://pub.dev" - source: hosted - version: "1.0.0-beta.6" - runtime_native_semaphores: - dependency: transitive - description: - name: runtime_native_semaphores - sha256: bd5895d87f97543be6c9a5199b8a10483b9d6871327fe508ec89dbc2437c9220 - url: "https://pub.dev" - source: hosted - version: "1.0.0-beta.6" scope: dependency: "direct main" description: name: scope - sha256: "80cf1cb727791fdaaa4131817974a6084815ed59b9ab02ef352c3a1badea488b" + sha256: "9930a3822bd33d1884a642d1cd79e6baf56d17288b3e0c54ae7c00cb559ef614" url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.1.1" settings_yaml: dependency: "direct main" description: name: settings_yaml - sha256: "415bc91cbcfe8b66b0945fdad8823b439ec9bd31591db6c1a4d2d07cab97899d" + sha256: ed2714686a1a22d45c1454ca3da1b0ce889b639b929aa09f6afa2bba8c0a423e url: "https://pub.dev" source: hosted - version: "8.1.0" + version: "8.2.0" shelf: dependency: "direct main" description: name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.2" shelf_packages_handler: dependency: "direct dev" description: @@ -626,18 +610,18 @@ packages: dependency: "direct main" description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" strings: dependency: "direct main" description: name: strings - sha256: b33f40c4dd3e597bf6d9e7f4f4dc282dad0f19b07d9f320cb5c2183859cbccf5 + sha256: "052836499f03897d3860a603b330c1ea3c8a14177b21f34b15a1295f36024aae" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sum_types: dependency: "direct main" description: @@ -666,26 +650,26 @@ packages: dependency: "direct dev" description: name: test - sha256: d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331 + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" url: "https://pub.dev" source: hosted - version: "1.25.5" + version: "1.25.8" test_api: dependency: "direct dev" description: name: test_api - sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.3" test_core: dependency: "direct dev" description: name: test_core - sha256: "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292" + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" url: "https://pub.dev" source: hosted - version: "0.6.2" + version: "0.6.5" typed_data: dependency: "direct main" description: @@ -730,10 +714,10 @@ packages: dependency: "direct main" description: name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.4.2" validators2: dependency: "direct main" description: @@ -746,10 +730,10 @@ packages: dependency: "direct dev" description: name: vm_service - sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.2" + version: "14.2.4" watcher: dependency: "direct main" description: @@ -762,26 +746,26 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.0.0" web_socket: dependency: transitive description: name: web_socket - sha256: "217f49b5213796cb508d6a942a5dc604ce1cb6a0a6b3d8cb3f0c314f0ecea712" + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.1.6" web_socket_channel: dependency: "direct main" description: name: web_socket_channel - sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276 + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" webkit_inspection_protocol: dependency: "direct main" description: @@ -794,10 +778,10 @@ packages: dependency: "direct main" description: name: win32 - sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480" + sha256: "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.5.3" yaml: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 6f0d956..e8f2a31 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ repository: https://github.com/onepub-dev/onepub environment: sdk: '>=3.4.0 <4.0.0' dependencies: - _fe_analyzer_shared: ^68.0.0 + # _fe_analyzer_shared: ^68.0.0 archive: ^3.6.0 args: ^2.5.0 @@ -20,15 +20,15 @@ dependencies: circular_buffer: 0.11.0 cli_util: 0.4.1 clock: 1.1.1 - collection: 1.18.0 + collection: ^1.19.0 convert: 3.1.1 coverage: ^1.8.0 crypto: 3.0.3 csv: ^6.0.0 dart_console: ^4.1.0 - dcli_core: ^4.0.0 - dcli_input: ^4.0.0 - dcli_terminal: ^4.0.0 + dcli_core: ^5.0.0 + dcli_input: ^5.0.0 + dcli_terminal: ^5.0.0 equatable: 2.0.5 ffi: ^2.1.2 file: 7.0.0 @@ -38,7 +38,7 @@ dependencies: globbing: 1.0.0 http: ^1.2.1 http_multi_server: 3.2.1 - http_parser: 4.0.2 + http_parser: ^4.1.0 ini: 2.1.0 intl: ^0.19.0 io: 1.0.4 @@ -61,17 +61,17 @@ dependencies: pubspec_manager: ^1.0.0 quiver: 3.2.1 random_string: 2.3.1 - scope: 4.1.0 + scope: ^4.1.1 settings_yaml: ^8.1.0 - shelf: 1.4.1 + shelf: ^1.4.2 source_map_stack_trace: 2.1.1 source_maps: 0.10.12 source_span: 1.10.0 stack_trace: 1.11.1 stacktrace_impl: 2.3.0 stream_channel: 2.1.2 - string_scanner: 1.2.0 - strings: 3.1.1 + string_scanner: ^1.3.0 + strings: ^3.1.2 sum_types: 0.3.5 system_info2: 4.0.0 term_glyph: 1.2.1 @@ -89,8 +89,8 @@ dependencies: yaml_edit: ^2.2.1 dev_dependencies: analyzer: ^6.5.0 - dcli: ^4.0.1 - lint_hard: 4.0.0 + dcli: ^5.0.0 + lint_hard: ^5.0.0 lints: ^4.0.0 matcher: 0.12.16+1 shelf_packages_handler: 3.0.2 diff --git a/test/fixtures/test_packag_1/pubspec.lock b/test/fixtures/test_packag_1/pubspec.lock index 219a4e2..b7bed6a 100644 --- a/test/fixtures/test_packag_1/pubspec.lock +++ b/test/fixtures/test_packag_1/pubspec.lock @@ -1,38 +1,22 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - sha256: "4826f97faae3af9761f26c52e56b2aa5ffd18d2c1721d984ad85137721c25f43" - url: "https://pub.dev" - source: hosted - version: "31.0.0" - analyzer: - dependency: "direct dev" - description: - name: analyzer - sha256: "7337610c3f9cd13e6b7c6bb0f410644091cf63c9a1436e73352a70f3286abb03" - url: "https://pub.dev" - source: hosted - version: "2.8.0" archive: dependency: transitive description: name: archive - sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d url: "https://pub.dev" source: hosted - version: "3.3.7" + version: "3.6.1" args: dependency: "direct dev" description: name: args - sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.5.0" async: dependency: "direct dev" description: @@ -45,18 +29,18 @@ packages: dependency: "direct dev" description: name: basic_utils - sha256: da518c9316eb83e13c0016592c226396c328a038d4cdbed9b7b2783a79620bfb + sha256: "2064b21d3c41ed7654bc82cc476fd65542e04d60059b74d5eed490a4da08fc6c" url: "https://pub.dev" source: hosted - version: "3.9.4" - boolean_selector: + version: "5.7.0" + characters: dependency: transitive description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "1.3.0" chunked_stream: dependency: transitive description: @@ -77,10 +61,10 @@ packages: dependency: "direct dev" description: name: cli_util - sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 url: "https://pub.dev" source: hosted - version: "0.3.5" + version: "0.4.1" clock: dependency: transitive description: @@ -93,10 +77,10 @@ packages: dependency: "direct dev" description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.19.0" convert: dependency: transitive description: @@ -117,34 +101,50 @@ packages: dependency: transitive description: name: csv - sha256: "016b31a51a913744a0a1655c74ff13c9379e1200e246a03d96c81c5d9ed297b5" + sha256: c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c url: "https://pub.dev" source: hosted - version: "5.0.2" - dart_console2: + version: "6.0.0" + dart_console: dependency: transitive description: - name: dart_console2 - sha256: f4d556196f1273d1d2f2657c045ad731623d2aa1b85be7182759ee8a759fd933 + name: dart_console + sha256: eae9ddd7bb69477a6e9821c75d575874e290887da09292732a35ab510d1de713 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "4.1.0" dcli: dependency: "direct dev" description: name: dcli - sha256: "1249bf78817e33f886f6f754291a0c6d8acdbc45782c109fa324cdd70f95b577" + sha256: d3df6c340c2015159578655e94a87560098d5052e23f8b10403f2f31f715b8de + url: "https://pub.dev" + source: hosted + version: "5.0.0" + dcli_common: + dependency: transitive + description: + name: dcli_common + sha256: d342b5eb461b0ce72fc7ccdb72b234456b3878fc26c37a8a1aef209eaaf089fa url: "https://pub.dev" source: hosted - version: "1.35.5" + version: "5.0.0" dcli_core: dependency: transitive description: name: dcli_core - sha256: "86c71b7bf3d93ca51ad3d64227acd3e595c98e4694aa3a48cce1c335409006b7" + sha256: "752baf94176d5b0e3100ec0c47d07e07f3590878ebf2b5a1e8e85fcde712b372" url: "https://pub.dev" source: hosted - version: "1.36.2" + version: "5.0.0" + dcli_terminal: + dependency: transitive + description: + name: dcli_terminal + sha256: "51d771ef5e8e15d739be6a235dad71132ec9397ef8fe3285a5570e66e699052b" + url: "https://pub.dev" + source: hosted + version: "5.0.0" equatable: dependency: "direct dev" description: @@ -157,42 +157,50 @@ packages: dependency: transitive description: name: ffi - sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.2" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" - file_utils: + version: "7.0.0" + fixnum: dependency: transitive description: - name: file_utils - sha256: d1e64389a22649095c8405c9e177272caf05139255931c9ff30d53b5c9bcaa34 + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" frontend_server_client: dependency: "direct dev" description: name: frontend_server_client - sha256: "4f4a162323c86ffc1245765cfe138872b8f069deb42f7dbb36115fa27f31469b" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" + functional_data: + dependency: transitive + description: + name: functional_data + sha256: "76d17dc707c40e552014f5a49c0afcc3f1e3f05e800cd6b7872940bfe41a5039" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "1.2.0" glob: dependency: "direct dev" description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" globbing: dependency: transitive description: @@ -205,10 +213,10 @@ packages: dependency: "direct dev" description: name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "0.13.6" + version: "1.2.2" http_multi_server: dependency: "direct dev" description: @@ -221,10 +229,10 @@ packages: dependency: "direct dev" description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.0" ini: dependency: transitive description: @@ -237,98 +245,106 @@ packages: dependency: transitive description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.19.0" js: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" + json2yaml: + dependency: transitive + description: + name: json2yaml + sha256: da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51 + url: "https://pub.dev" + source: hosted + version: "3.0.1" json_annotation: dependency: "direct dev" description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" lint_hard: dependency: "direct dev" description: name: lint_hard - sha256: d9cb96856a6c08f9d9d012de17bd45a9aa3950738c7bb6e01676a1c29625a4aa + sha256: "638d2cce6d3d5499826be71311d18cded797a51351eaa1aee7a35a2f0f9bc46e" url: "https://pub.dev" source: hosted - version: "3.0.1" - logging: + version: "5.0.0" + lists: dependency: transitive description: - name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + name: lists + sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27" url: "https://pub.dev" source: hosted - version: "1.1.1" - matcher: + version: "1.0.1" + logging: dependency: transitive description: - name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "1.2.0" meta: dependency: "direct dev" description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.15.0" mime: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" url: "https://pub.dev" source: hosted - version: "1.0.4" - oauth2: - dependency: "direct dev" + version: "1.0.5" + native_synchronization_temp: + dependency: transitive description: - name: oauth2 - sha256: "1e8376c222651904caf7785fd2fa01b1e2be608c94bec842a94e116deca88f13" + name: native_synchronization_temp + sha256: "95ccdee4c0ab7440e7d86ef76af63013cc0c379485d5e0339a7b59de6e58091e" url: "https://pub.dev" source: hosted - version: "2.0.1" - package_config: - dependency: transitive + version: "0.4.0" + oauth2: + dependency: "direct dev" description: - name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + name: oauth2 + sha256: c4013ef62be37744efdc0861878fd9e9285f34db1f9e331cc34100d7674feb42 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.0.2" path: dependency: "direct dev" description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" pointycastle: dependency: transitive description: name: pointycastle - sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe" url: "https://pub.dev" source: hosted - version: "3.7.3" + version: "3.9.1" pool: dependency: "direct dev" description: @@ -341,10 +357,10 @@ packages: dependency: transitive description: name: posix - sha256: "203e3ad9df376927118dc662e1724dde1f64e2c3292cd59a8082d4a2de84bb70" + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "6.0.1" pub_semver: dependency: "direct dev" description: @@ -353,54 +369,46 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - pubspec2: - dependency: "direct dev" - description: - name: pubspec2 - sha256: "7b1fd81927f1da6d88457c83b51134e1bc8cb07638bd8d9e205b2ce1cd9ec091" - url: "https://pub.dev" - source: hosted - version: "2.4.2" - quiver: + pubspec_lock: dependency: transitive description: - name: quiver - sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + name: pubspec_lock + sha256: ed5fc1ecd0cdc0e14475a091afcb2c4cbb00e74cebff17635e9abbec18d76cc4 url: "https://pub.dev" source: hosted - version: "3.2.1" - random_string: - dependency: transitive + version: "3.0.2" + pubspec_manager: + dependency: "direct dev" description: - name: random_string - sha256: "03b52435aae8cbdd1056cf91bfc5bf845e9706724dd35ae2e99fa14a1ef79d02" + name: pubspec_manager + sha256: b2674161f3f69ed07bc164dc4172afc190d56f060a293a8eb6fa691e5ddf9b5c url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "1.0.0" scope: - dependency: transitive + dependency: "direct dev" description: name: scope - sha256: e0c880d8f0db2ffd2accd63eeb02396748f3b8a2f71bce4b7d3f8dab75fc8a74 + sha256: "9930a3822bd33d1884a642d1cd79e6baf56d17288b3e0c54ae7c00cb559ef614" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.1.1" settings_yaml: dependency: "direct dev" description: name: settings_yaml - sha256: c73512069690260c6ab0b210dc2e040edda8f467723522f86e42546ec1efb42b + sha256: ed2714686a1a22d45c1454ca3da1b0ce889b639b929aa09f6afa2bba8c0a423e url: "https://pub.dev" source: hosted - version: "3.5.1" + version: "8.2.0" shelf: dependency: "direct dev" description: name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.2" source_span: dependency: "direct dev" description: @@ -409,46 +417,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" - stack_trace: - dependency: "direct dev" + sprintf: + dependency: transitive description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" url: "https://pub.dev" source: hosted - version: "1.11.0" - stacktrace_impl: - dependency: transitive + version: "7.0.0" + stack_trace: + dependency: "direct dev" description: - name: stacktrace_impl - sha256: a42791862f672151d7f5a12911bf607c5b6d600f15f4f2457ef4ec92bfcf561b + name: stack_trace + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" + strings: + dependency: transitive + description: + name: strings + sha256: "052836499f03897d3860a603b330c1ea3c8a14177b21f34b15a1295f36024aae" + url: "https://pub.dev" + source: hosted + version: "3.1.2" + sum_types: + dependency: transitive + description: + name: sum_types + sha256: c0a0fad9a518d011987e1d9f27fc336194294e55dafdc3699363e52aa5776e09 + url: "https://pub.dev" + source: hosted + version: "0.3.5" system_info2: dependency: transitive description: name: system_info2 - sha256: "90621f3ba586e1f268e38cc7951b172cd4d997e43dc1fbed12eb334c8a22a886" + sha256: "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9" url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "4.0.0" term_glyph: dependency: transitive description: @@ -457,14 +481,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: daadc9baabec998b062c9091525aa95786508b1c48e9c30f1f891b8bf6ff2e64 - url: "https://pub.dev" - source: hosted - version: "0.5.2" typed_data: dependency: "direct dev" description: @@ -473,62 +489,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - url_builder: - dependency: "direct dev" + unicode: + dependency: transitive description: - name: url_builder - sha256: a87188a2771a114195438642a0b02597e2e4f30994657fa703a8833673c3447d + name: unicode + sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1" url: "https://pub.dev" source: hosted - version: "1.0.0" - usage: + version: "0.3.1" + url_builder: dependency: "direct dev" description: - name: usage - sha256: "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15" + name: url_builder + sha256: "47ab56e7eb5cbff08c213057a328f8650f8c19057b6f5a8998e56104d0d5aa75" url: "https://pub.dev" source: hosted - version: "4.1.1" + version: "2.0.0" uuid: dependency: transitive description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.4.2" validators2: dependency: "direct dev" description: name: validators2 - sha256: c95746d5176ed1c01aff95fcd1ef22b6459f48a8aa26577ddf7a1e21919a81dc + sha256: "5c63054b2f47b6a3f39e0d0e3f5d38829db4545250144a34c9e1585466de4814" url: "https://pub.dev" source: hosted - version: "3.0.0" - vin_decoder: - dependency: transitive - description: - name: vin_decoder - sha256: d6934cd36d24e5f306dbcc3eb00f7104fb7d34e2bc82ab2c67f89cedbc983250 - url: "https://pub.dev" - source: hosted - version: "0.2.1-nullsafety" + version: "5.0.0" watcher: dependency: "direct dev" description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.0" win32: dependency: "direct dev" description: name: win32 - sha256: "6b75ac2ddd42f5c226fdaf4498a2b04071c06f1f2b8f7ab1c3f77cc7f2285ff1" + sha256: "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9" url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "5.5.3" yaml: dependency: "direct dev" description: @@ -541,9 +557,9 @@ packages: dependency: "direct dev" description: name: yaml_edit - sha256: "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd" + sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.2.1" sdks: - dart: ">=2.19.0 <4.0.0" + dart: ">=3.4.0 <4.0.0" diff --git a/test/fixtures/test_packag_1/pubspec.yaml b/test/fixtures/test_packag_1/pubspec.yaml index 607998a..855c6ec 100644 --- a/test/fixtures/test_packag_1/pubspec.yaml +++ b/test/fixtures/test_packag_1/pubspec.yaml @@ -1,40 +1,40 @@ name: test_packag_1 version: 1.0.0 description: A simple command-line application. -environment: +environment: sdk: '>=2.19.0 <4.0.0' -dev_dependencies: - analyzer: ^2.3.0 +dev_dependencies: args: ^2.3.0 async: ^2.8.2 - basic_utils: ^3.8.0 - cli_util: ^0.3.5 + basic_utils: ^5.7.0 + cli_util: ^0.4.1 collection: ^1.15.0 crypto: ^3.0.1 - dcli: ^4.0.1 + dcli: ^5.0.0 equatable: ^2.0.3 - frontend_server_client: ^2.1.2 + frontend_server_client: ^4.0.0 glob: ^2.0.1 - http: ^0.13.3 + http: ^1.2.2 http_multi_server: ^3.0.1 http_parser: ^4.0.0 json_annotation: ^4.1.0 - lint_hard: ^3.0.0 + lint_hard: ^5.0.0 meta: ^1.7.0 oauth2: ^2.0.0 path: ^1.8.1 pool: ^1.5.0 pub_semver: ^2.1.0 - pubspec2: ^2.4.0 - settings_yaml: ^3.4.1 + pubspec_manager: ^1.0.0 + scope: ^4.1.1 + settings_yaml: ^8.2.0 shelf: ^1.2.0 source_span: ^1.8.1 stack_trace: ^1.10.0 typed_data: ^1.3.0 - url_builder: ^1.0.0 - usage: ^4.0.2 - validators2: ^3.0.0 + url_builder: ^2.0.0 + validators2: ^5.0.0 watcher: ^1.0.0 - win32: ^2.0.5 + win32: ^5.5.3 yaml: ^3.1.0 - yaml_edit: ^2.0.2 \ No newline at end of file + yaml_edit: ^2.0.2 +publish_to: https://onepub.dev/api/jbbxpsdavu/ diff --git a/test/fixtures/test_packag_2/pubspec.lock b/test/fixtures/test_packag_2/pubspec.lock index 837853a..a75017e 100644 --- a/test/fixtures/test_packag_2/pubspec.lock +++ b/test/fixtures/test_packag_2/pubspec.lock @@ -5,9 +5,25 @@ packages: dependency: "direct dev" description: name: lint_hard - sha256: d9cb96856a6c08f9d9d012de17bd45a9aa3950738c7bb6e01676a1c29625a4aa + sha256: "638d2cce6d3d5499826be71311d18cded797a51351eaa1aee7a35a2f0f9bc46e" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.0.0" + meta: + dependency: transitive + description: + name: meta + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + url: "https://pub.dev" + source: hosted + version: "1.15.0" + scope: + dependency: "direct dev" + description: + name: scope + sha256: d4ee4dacb133196db274c202d507622a619b01aa7d2354c42ce5cdc4b267ead6 + url: "https://pub.dev" + source: hosted + version: "5.0.0" sdks: - dart: ">=2.19.0 <4.0.0" + dart: ">=3.0.0 <4.0.0" diff --git a/test/fixtures/test_packag_2/pubspec.yaml b/test/fixtures/test_packag_2/pubspec.yaml index e3230a1..1fd3d6a 100644 --- a/test/fixtures/test_packag_2/pubspec.yaml +++ b/test/fixtures/test_packag_2/pubspec.yaml @@ -1,9 +1,10 @@ name: test_packag_2 version: 1.32.0 homepage: https://github.com -publish_to: https://squarephone.biz/api/jbbxpsdavu/ +publish_to: https://onepub.dev/api/jbbxpsdavu/ description: A simple command-line application. -environment: +environment: sdk: '>=2.19.0 <4.0.0' -dev_dependencies: - lint_hard: ^3.0.0 +dev_dependencies: + lint_hard: ^5.0.0 + scope: ^5.0.0