From 2d2620861c0423f414bbee6731a6052ad2b0db52 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 5 Aug 2024 13:43:39 -0700 Subject: [PATCH] Latest lints, require Dart 3.4 --- .github/workflows/test-package.yml | 2 +- CHANGELOG.md | 2 +- lib/package_config.dart | 2 +- lib/package_config_types.dart | 2 +- lib/src/util.dart | 2 +- lib/src/util_io.dart | 2 +- pubspec.yaml | 4 ++-- test/discovery_test.dart | 2 +- test/discovery_uri_test.dart | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index 3371710..704ee2e 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -46,7 +46,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - sdk: [3.2, dev] + sdk: [3.4, dev] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2870c8c..f9fec1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## 2.1.1-wip -- Require Dart 3.2 +- Require Dart 3.4 ## 2.1.0 diff --git a/lib/package_config.dart b/lib/package_config.dart index 194fe89..074c977 100644 --- a/lib/package_config.dart +++ b/lib/package_config.dart @@ -7,7 +7,7 @@ /// /// This package provides functionality to find, read and write package /// configurations in the [specified format](https://github.com/dart-lang/language/blob/master/accepted/future-releases/language-versioning/package-config-file-v2.md). -library package_config.package_config; +library; import 'dart:io' show Directory, File; import 'dart:typed_data' show Uint8List; diff --git a/lib/package_config_types.dart b/lib/package_config_types.dart index 756be05..825f7ac 100644 --- a/lib/package_config_types.dart +++ b/lib/package_config_types.dart @@ -10,7 +10,7 @@ /// {@canonicalFor package_config.Package} /// {@canonicalFor package_config.PackageConfig} /// {@canonicalFor errors.PackageConfigError} -library package_config.package_config_types; +library; export 'src/errors.dart' show PackageConfigError; export 'src/package_config.dart' diff --git a/lib/src/util.dart b/lib/src/util.dart index f1fa207..4f0210c 100644 --- a/lib/src/util.dart +++ b/lib/src/util.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Utility methods used by more than one library in the package. -library package_config.util; +library; import 'errors.dart'; diff --git a/lib/src/util_io.dart b/lib/src/util_io.dart index 914ea38..4680eef 100644 --- a/lib/src/util_io.dart +++ b/lib/src/util_io.dart @@ -4,7 +4,7 @@ /// Utility methods requiring dart:io and used by more than one library in the /// package. -library package_config.util_io; +library; import 'dart:io'; import 'dart:typed_data'; diff --git a/pubspec.yaml b/pubspec.yaml index 9db82c6..545701d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,11 +4,11 @@ description: Support for reading and writing Dart Package Configuration files. repository: https://github.com/dart-lang/package_config environment: - sdk: ^3.2.0 + sdk: ^3.4.0 dependencies: path: ^1.8.0 dev_dependencies: - dart_flutter_team_lints: ^2.1.0 + dart_flutter_team_lints: ^3.0.0 test: ^1.16.0 diff --git a/test/discovery_test.dart b/test/discovery_test.dart index 2ca337a..6d1b655 100644 --- a/test/discovery_test.dart +++ b/test/discovery_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. @TestOn('vm') -library package_config.discovery_test; +library; import 'dart:io'; diff --git a/test/discovery_uri_test.dart b/test/discovery_uri_test.dart index b71ed51..542bf0a 100644 --- a/test/discovery_uri_test.dart +++ b/test/discovery_uri_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. @TestOn('vm') -library package_config.discovery_test; +library; import 'package:package_config/package_config.dart'; import 'package:test/test.dart';