From 8d438cb0a8a232705c10fc5a956a0ee7198bc8ac Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 12 Sep 2024 16:38:34 +0200 Subject: [PATCH] Update to use and analyze with 3.5 language version (#8041) * Update to 3.5 language version * Revert runtime SDK change --- .github/workflows/dart.yml | 4 ++-- analysis_options.yaml | 2 -- app/lib/fake/backend/fake_email_sender.dart | 2 +- app/lib/frontend/dom/dom.dart | 13 ++++++------- app/lib/package/model_properties.dart | 6 +++--- app/lib/package/name_tracker.dart | 4 ++-- app/lib/tool/utils/http.dart | 2 +- app/pubspec.lock | 2 +- app/pubspec.yaml | 2 +- pkg/_popularity/pubspec.lock | 2 +- pkg/_popularity/pubspec.yaml | 2 +- pkg/_pub_shared/lib/utils/flutter_archive.dart | 2 +- pkg/_pub_shared/pubspec.lock | 2 +- pkg/_pub_shared/pubspec.yaml | 2 +- pkg/api_builder/lib/_client_utils.dart | 2 +- pkg/api_builder/pubspec.lock | 2 +- pkg/api_builder/pubspec.yaml | 2 +- pkg/code_coverage/pubspec.lock | 2 +- pkg/code_coverage/pubspec.yaml | 2 +- pkg/fake_gcloud/pubspec.lock | 2 +- pkg/fake_gcloud/pubspec.yaml | 2 +- pkg/indexed_blob/pubspec.lock | 2 +- pkg/indexed_blob/pubspec.yaml | 2 +- pkg/pub_integration/lib/src/test_browser.dart | 2 +- pkg/pub_integration/pubspec.lock | 2 +- pkg/pub_integration/pubspec.yaml | 2 +- pkg/pub_package_reader/pubspec.lock | 2 +- pkg/pub_package_reader/pubspec.yaml | 2 +- pkg/pub_worker/pubspec.lock | 2 +- pkg/pub_worker/pubspec.yaml | 2 +- pkg/web_app/pubspec.lock | 2 +- pkg/web_app/pubspec.yaml | 2 +- pkg/web_css/pubspec.lock | 2 +- pkg/web_css/pubspec.yaml | 2 +- tool/ci.sh | 2 +- 35 files changed, 43 insertions(+), 46 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 8d0a4cf53e..afdf340659 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.1 +# Created with package:mono_repo v6.6.2 name: Dart CI on: push: @@ -36,7 +36,7 @@ jobs: name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.1 + run: dart pub global activate mono_repo 6.6.2 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: diff --git a/analysis_options.yaml b/analysis_options.yaml index 65c2a13c91..4fc319eb15 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -9,7 +9,6 @@ analyzer: linter: rules: - always_declare_return_types - - always_require_non_null_named_parameters - annotate_overrides - avoid_empty_else - avoid_init_to_null @@ -50,7 +49,6 @@ linter: - prefer_collection_literals - prefer_conditional_assignment - prefer_contains - - prefer_equal_for_default_values - prefer_final_fields - prefer_final_locals - prefer_for_elements_to_map_fromIterable diff --git a/app/lib/fake/backend/fake_email_sender.dart b/app/lib/fake/backend/fake_email_sender.dart index 1b7d33068d..79b8d1258d 100644 --- a/app/lib/fake/backend/fake_email_sender.dart +++ b/app/lib/fake/backend/fake_email_sender.dart @@ -36,7 +36,7 @@ class FakeEmailSender implements EmailSender { sentMessages.add(message); if (_outputDir != null) { final uuid = message.localMessageId ?? Ulid().toCanonical(); - final file = File(p.join(_outputDir!, '$uuid.json')); + final file = File(p.join(_outputDir, '$uuid.json')); await file.parent.create(recursive: true); await file.writeAsString(json.encode(message.toJson())); } diff --git a/app/lib/frontend/dom/dom.dart b/app/lib/frontend/dom/dom.dart index 255a561ec0..8fecba7355 100644 --- a/app/lib/frontend/dom/dom.dart +++ b/app/lib/frontend/dom/dom.dart @@ -1036,19 +1036,18 @@ class _StringElement extends _StringNode { final Map? _attributes; final Object? _children; - _StringElement(this._tag, this._attributes, this._children) { - assert(_children == null || - _children is _StringNode || - (_children is Iterable && - (_children as Iterable).every((c) => c is _StringNode))); - } + _StringElement(this._tag, this._attributes, this._children) + : assert(_children == null || + _children is _StringNode || + (_children is Iterable && + (_children).every((c) => c is _StringNode))); @override void writeHtml(StringSink sink) { sink.write('<'); sink.write(_tag); if (_attributes != null) { - for (final e in _attributes!.entries) { + for (final e in _attributes.entries) { sink.write(' '); sink.write(e.key); sink.write('="'); diff --git a/app/lib/package/model_properties.dart b/app/lib/package/model_properties.dart index ef05023e7d..2223808078 100644 --- a/app/lib/package/model_properties.dart +++ b/app/lib/package/model_properties.dart @@ -121,7 +121,7 @@ class Pubspec { return (minDartVersion != null && minDartVersion.value.compareTo(dartSdkVersion) > 0) || (_minFlutterSdkVersion != null && - _minFlutterSdkVersion!.value.compareTo(flutterSdkVersion) > 0); + _minFlutterSdkVersion.value.compareTo(flutterSdkVersion) > 0); } /// True if either the Dart or the Flutter SDK constraint is higher than the @@ -144,8 +144,8 @@ class Pubspec { late final _dartSdkConstraint = _inner.environment?['sdk']; late final _flutterSdkConstraint = _inner.environment?['flutter']; late final _hasDartSdkConstraint = _dartSdkConstraint != null && - !_dartSdkConstraint!.isAny && - !_dartSdkConstraint!.isEmpty; + !_dartSdkConstraint.isAny && + !_dartSdkConstraint.isEmpty; SdkConstraintStatus get _sdkConstraintStatus => SdkConstraintStatus.fromSdkVersion(_dartSdkConstraint, name); diff --git a/app/lib/package/name_tracker.dart b/app/lib/package/name_tracker.dart index a0a4920456..4babc534ff 100644 --- a/app/lib/package/name_tracker.dart +++ b/app/lib/package/name_tracker.dart @@ -158,7 +158,7 @@ class NameTracker { await for (final p in _db!.query().run()) { data.add(TrackedPackage.fromPackage(p)); } - await for (final p in _db!.query().run()) { + await for (final p in _db.query().run()) { data.addModeratedName(p.name!); } _data = data; @@ -185,7 +185,7 @@ class NameTracker { _data.add(TrackedPackage.fromPackage(p)); } - final moderatedPkgQuery = _db!.query() + final moderatedPkgQuery = _db.query() ..order('moderated') ..filter('moderated >', ts); diff --git a/app/lib/tool/utils/http.dart b/app/lib/tool/utils/http.dart index 35ab3fe331..bb4bf7e58b 100644 --- a/app/lib/tool/utils/http.dart +++ b/app/lib/tool/utils/http.dart @@ -53,7 +53,7 @@ class _AuthenticatedClient extends http.BaseClient { } final currentCookies = request.headers['cookie']; final providedCookies = - _cookieProvider == null ? null : await _cookieProvider!(); + _cookieProvider == null ? null : await _cookieProvider(); final sessionId = await _sessionIdProvider(); request.headers['cookie'] = [ diff --git a/app/pubspec.lock b/app/pubspec.lock index 469b7bc4d5..9af6234ede 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -937,4 +937,4 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=3.5.0-259.0.dev <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 598177309c..b2a2c275aa 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -1,7 +1,7 @@ name: pub_dev description: The pub.dartlang.org website. environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: _popularity: path: ../pkg/_popularity diff --git a/pkg/_popularity/pubspec.lock b/pkg/_popularity/pubspec.lock index c8455b1d87..1c06c3a038 100644 --- a/pkg/_popularity/pubspec.lock +++ b/pkg/_popularity/pubspec.lock @@ -559,4 +559,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0-259.0.dev <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/_popularity/pubspec.yaml b/pkg/_popularity/pubspec.yaml index 1083ce14ce..bd4a41bf62 100644 --- a/pkg/_popularity/pubspec.yaml +++ b/pkg/_popularity/pubspec.yaml @@ -2,7 +2,7 @@ name: _popularity publish_to: none environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: json_annotation: ^4.6.0 diff --git a/pkg/_pub_shared/lib/utils/flutter_archive.dart b/pkg/_pub_shared/lib/utils/flutter_archive.dart index 0a7b9b1d3e..b089f086bb 100644 --- a/pkg/_pub_shared/lib/utils/flutter_archive.dart +++ b/pkg/_pub_shared/lib/utils/flutter_archive.dart @@ -131,7 +131,7 @@ class FlutterRelease { return null; } try { - return Version.parse(_extractedDartSdkVersion!); + return Version.parse(_extractedDartSdkVersion); } catch (_) { return null; } diff --git a/pkg/_pub_shared/pubspec.lock b/pkg/_pub_shared/pubspec.lock index af701b458d..16f965b889 100644 --- a/pkg/_pub_shared/pubspec.lock +++ b/pkg/_pub_shared/pubspec.lock @@ -638,4 +638,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0-259.0.dev <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/_pub_shared/pubspec.yaml b/pkg/_pub_shared/pubspec.yaml index df1e756656..a2fe5cb67a 100644 --- a/pkg/_pub_shared/pubspec.yaml +++ b/pkg/_pub_shared/pubspec.yaml @@ -2,7 +2,7 @@ name: _pub_shared description: Shared data between the pub server and web_app client. publish_to: none environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: clock: ^1.1.0 diff --git a/pkg/api_builder/lib/_client_utils.dart b/pkg/api_builder/lib/_client_utils.dart index 3211fd7437..417390b1e2 100644 --- a/pkg/api_builder/lib/_client_utils.dart +++ b/pkg/api_builder/lib/_client_utils.dart @@ -38,7 +38,7 @@ class Client { Future _withClient(FutureOr Function(http.Client) fn) async { if (_client != null) { - return fn(_client!); + return fn(_client); } final client = http.Client(); try { diff --git a/pkg/api_builder/pubspec.lock b/pkg/api_builder/pubspec.lock index 1293feb9b1..81819462ab 100644 --- a/pkg/api_builder/pubspec.lock +++ b/pkg/api_builder/pubspec.lock @@ -583,4 +583,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0-259.0.dev <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/api_builder/pubspec.yaml b/pkg/api_builder/pubspec.yaml index 6efe7b09a7..756edf1134 100644 --- a/pkg/api_builder/pubspec.yaml +++ b/pkg/api_builder/pubspec.yaml @@ -3,7 +3,7 @@ description: Builder for generating API routers. publish_to: none environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: build: ^2.0.0 diff --git a/pkg/code_coverage/pubspec.lock b/pkg/code_coverage/pubspec.lock index 1b7fcffa6e..8b900b13ae 100644 --- a/pkg/code_coverage/pubspec.lock +++ b/pkg/code_coverage/pubspec.lock @@ -378,4 +378,4 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/code_coverage/pubspec.yaml b/pkg/code_coverage/pubspec.yaml index 7637ad08e9..398964e9c2 100644 --- a/pkg/code_coverage/pubspec.yaml +++ b/pkg/code_coverage/pubspec.yaml @@ -2,7 +2,7 @@ name: code_coverage publish_to: none # don't publish yet description: Code coverage tools. environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: args: ^2.0.0 diff --git a/pkg/fake_gcloud/pubspec.lock b/pkg/fake_gcloud/pubspec.lock index 444a61999f..2386e2d384 100644 --- a/pkg/fake_gcloud/pubspec.lock +++ b/pkg/fake_gcloud/pubspec.lock @@ -431,4 +431,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/fake_gcloud/pubspec.yaml b/pkg/fake_gcloud/pubspec.yaml index e797004a78..a4127a0e60 100644 --- a/pkg/fake_gcloud/pubspec.yaml +++ b/pkg/fake_gcloud/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none # don't publish yet description: Fake, in-memory implementation of `package:gcloud` interfaces. environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: gcloud: '^0.8.10' diff --git a/pkg/indexed_blob/pubspec.lock b/pkg/indexed_blob/pubspec.lock index 27a2b24a74..98310f98a6 100644 --- a/pkg/indexed_blob/pubspec.lock +++ b/pkg/indexed_blob/pubspec.lock @@ -399,4 +399,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/indexed_blob/pubspec.yaml b/pkg/indexed_blob/pubspec.yaml index 4ba3eb51e0..4f95dd760a 100644 --- a/pkg/indexed_blob/pubspec.yaml +++ b/pkg/indexed_blob/pubspec.yaml @@ -1,7 +1,7 @@ name: indexed_blob publish_to: none environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: async: ^2.8.0 jsontool: ^1.1.0 diff --git a/pkg/pub_integration/lib/src/test_browser.dart b/pkg/pub_integration/lib/src/test_browser.dart index 23d709327e..322e1840fb 100644 --- a/pkg/pub_integration/lib/src/test_browser.dart +++ b/pkg/pub_integration/lib/src/test_browser.dart @@ -100,7 +100,7 @@ class TestBrowser { _printCoverage(); if (_coverageDir != null) { - await _saveCoverage(p.join(_coverageDir!, 'puppeteer')); + await _saveCoverage(p.join(_coverageDir, 'puppeteer')); } await _tempDir.delete(recursive: true); } diff --git a/pkg/pub_integration/pubspec.lock b/pkg/pub_integration/pubspec.lock index 8f72eafe94..4d6aedbda8 100644 --- a/pkg/pub_integration/pubspec.lock +++ b/pkg/pub_integration/pubspec.lock @@ -597,4 +597,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/pub_integration/pubspec.yaml b/pkg/pub_integration/pubspec.yaml index 51f10c8a5e..06412ca341 100644 --- a/pkg/pub_integration/pubspec.yaml +++ b/pkg/pub_integration/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none # don't publish yet description: Tools for integration tests. environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: _pub_shared: diff --git a/pkg/pub_package_reader/pubspec.lock b/pkg/pub_package_reader/pubspec.lock index e8c6954ea1..50770b5ff5 100644 --- a/pkg/pub_package_reader/pubspec.lock +++ b/pkg/pub_package_reader/pubspec.lock @@ -447,4 +447,4 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/pub_package_reader/pubspec.yaml b/pkg/pub_package_reader/pubspec.yaml index 1e9b359e48..254543996e 100644 --- a/pkg/pub_package_reader/pubspec.yaml +++ b/pkg/pub_package_reader/pubspec.yaml @@ -3,7 +3,7 @@ description: Scans the package archive, extracts its main content and checks for publish_to: none environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: clock: ^1.1.0 diff --git a/pkg/pub_worker/pubspec.lock b/pkg/pub_worker/pubspec.lock index c0f49037b7..3049b97173 100644 --- a/pkg/pub_worker/pubspec.lock +++ b/pkg/pub_worker/pubspec.lock @@ -796,4 +796,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0-259.0.dev <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/pub_worker/pubspec.yaml b/pkg/pub_worker/pubspec.yaml index ff9d574b0a..6e67a29947 100644 --- a/pkg/pub_worker/pubspec.yaml +++ b/pkg/pub_worker/pubspec.yaml @@ -3,7 +3,7 @@ description: Worker for pana and dartdoc analysis for pub.dev publish_to: none environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: appengine: ^0.13.6 diff --git a/pkg/web_app/pubspec.lock b/pkg/web_app/pubspec.lock index e43aadb6f9..35bc71ecac 100644 --- a/pkg/web_app/pubspec.lock +++ b/pkg/web_app/pubspec.lock @@ -581,4 +581,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/web_app/pubspec.yaml b/pkg/web_app/pubspec.yaml index 44dd9656f8..1bdef94d9e 100644 --- a/pkg/web_app/pubspec.yaml +++ b/pkg/web_app/pubspec.yaml @@ -2,7 +2,7 @@ name: web_app publish_to: none environment: - sdk: '^3.4.0' + sdk: ^3.5.0 dependencies: _pub_shared: diff --git a/pkg/web_css/pubspec.lock b/pkg/web_css/pubspec.lock index f531306858..f786db8710 100644 --- a/pkg/web_css/pubspec.lock +++ b/pkg/web_css/pubspec.lock @@ -575,4 +575,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/pkg/web_css/pubspec.yaml b/pkg/web_css/pubspec.yaml index afab944120..e7270801e4 100644 --- a/pkg/web_css/pubspec.yaml +++ b/pkg/web_css/pubspec.yaml @@ -2,7 +2,7 @@ name: web_css publish_to: none environment: - sdk: '^3.0.0' + sdk: ^3.5.0 dependencies: sass: ^1.32.8 diff --git a/tool/ci.sh b/tool/ci.sh index 3afbd0a7b3..978ccbcef5 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v6.6.1 +# Created with package:mono_repo v6.6.2 # Support built in commands on windows out of the box.