Migrate packages_file and language_version to null-safety (#3139)
diff --git a/lib/src/language_version.dart b/lib/src/language_version.dart
index 7174ebd..e294014 100644
--- a/lib/src/language_version.dart
+++ b/lib/src/language_version.dart
@@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// @dart=2.10
-
import 'package:analyzer/dart/ast/token.dart';
import 'package:pub_semver/pub_semver.dart';
@@ -19,13 +17,11 @@
/// The language version implied by a Dart sdk version.
factory LanguageVersion.fromVersion(Version version) {
- ArgumentError.checkNotNull(version, 'version');
return LanguageVersion(version.major, version.minor);
}
/// Parse language version from string.
factory LanguageVersion.parse(String languageVersion) {
- ArgumentError.checkNotNull(languageVersion, 'languageVersion');
final m = _languageVersionPattern.firstMatch(languageVersion);
if (m == null) {
throw FormatException(
@@ -34,8 +30,8 @@
);
}
return LanguageVersion(
- int.parse(m.group(1)),
- int.parse(m.group(2)),
+ int.parse(m.group(1)!),
+ int.parse(m.group(2)!),
);
}
@@ -44,14 +40,14 @@
///
/// Fallbacks to [defaultLanguageVersion] if there is no [sdkConstraint] or
/// the [sdkConstraint] has no lower-bound.
- factory LanguageVersion.fromSdkConstraint(VersionConstraint sdkConstraint) {
+ factory LanguageVersion.fromSdkConstraint(VersionConstraint? sdkConstraint) {
if (sdkConstraint == null || sdkConstraint.isEmpty) {
return defaultLanguageVersion;
} else if (sdkConstraint is Version) {
return LanguageVersion.fromVersion(sdkConstraint);
} else if (sdkConstraint is VersionRange) {
if (sdkConstraint.min != null) {
- return LanguageVersion.fromVersion(sdkConstraint.min);
+ return LanguageVersion.fromVersion(sdkConstraint.min!);
}
return defaultLanguageVersion;
} else if (sdkConstraint is VersionUnion) {
diff --git a/lib/src/packages_file.dart b/lib/src/packages_file.dart
index fd4dd58..6833ae8 100644
--- a/lib/src/packages_file.dart
+++ b/lib/src/packages_file.dart
@@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// @dart=2.10
-
// ignore_for_file: prefer_single_quotes
// This code is copied from an older version of package:package_config - and
@@ -113,7 +111,7 @@
/// All the keys of [packageMapping] must be valid package names,
/// and the values must be URIs that do not have the `package:` scheme.
void write(StringSink output, Map<String, Uri> packageMapping,
- {Uri baseUri, String comment, bool allowDefaultPackage = false}) {
+ {Uri? baseUri, String? comment, bool allowDefaultPackage = false}) {
ArgumentError.checkNotNull(allowDefaultPackage, 'allowDefaultPackage');
if (baseUri != null && !baseUri.isAbsolute) {
@@ -317,7 +315,7 @@
/// `baseUri.resolveUri(result) == uri`,
///
/// The `baseUri` must be absolute.
-Uri relativizeUri(Uri uri, Uri /*?*/ baseUri) {
+Uri relativizeUri(Uri uri, Uri? baseUri) {
if (baseUri == null) return uri;
assert(baseUri.isAbsolute);
if (uri.hasQuery || uri.hasFragment) {
@@ -472,7 +470,7 @@
class PackageConfigArgumentError extends ArgumentError
implements PackageConfigError {
- PackageConfigArgumentError(Object /*?*/ value, String name, String message)
+ PackageConfigArgumentError(Object? value, String name, String message)
: super.value(value, name, message);
PackageConfigArgumentError.from(ArgumentError error)
@@ -481,8 +479,7 @@
class PackageConfigFormatException extends FormatException
implements PackageConfigError {
- PackageConfigFormatException(String message, Object /*?*/ source,
- [int /*?*/ offset])
+ PackageConfigFormatException(String message, Object? source, [int? offset])
: super(message, source, offset);
PackageConfigFormatException.from(FormatException exception)
