From 61c760a4711c6e24e979461d618b5715eea3d907 Mon Sep 17 00:00:00 2001 From: Alexei Sintotski Date: Tue, 10 Aug 2021 09:05:08 +0200 Subject: [PATCH] Release 1.4.6 preps --- CHANGELOG.md | 2 ++ bin/src/pub_operations.dart | 8 ++++---- dev/dart_quality_checks.sh | 2 +- lib/src/configuration/configuration.g.dart | 14 ++++++++------ pubspec.yaml | 4 ++-- .../package_with_pubspec_lock/pubspec.yaml | 2 +- .../package_without_pubspec_lock/pubspec.yaml | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ae3537..1fa247b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.4.6] - Dart 2.12+ expects SDK specification in pubspec.yaml + ## [1.4.5+1] - Dart 2.10 and upgraded dependencies ## [1.4.5] - 2020-09-20 diff --git a/bin/src/pub_operations.dart b/bin/src/pub_operations.dart index 22c6291..2b233c5 100644 --- a/bin/src/pub_operations.dart +++ b/bin/src/pub_operations.dart @@ -126,10 +126,10 @@ String _createPubCommandLine({ package.isFlutterPackage ? configuration.flutterSdkPath.iif( some: (flutterSdkPath) => '${path.joinAll([ - flutterSdkPath, - 'bin', - 'flutter' - ])} $flutterArguments', + flutterSdkPath, + 'bin', + 'flutter' + ])} $flutterArguments', none: () => throw BorgException( 'FATAL: Cannot bootstrap Flutter package ${package.path}, ' 'path to Flutter SDK is not defined'), diff --git a/dev/dart_quality_checks.sh b/dev/dart_quality_checks.sh index 060b961..a66315a 100755 --- a/dev/dart_quality_checks.sh +++ b/dev/dart_quality_checks.sh @@ -7,7 +7,7 @@ dart bin/main.dart boot --mode=basic dart bin/main.dart boot --mode=incremental dartanalyzer --fatal-hints . pub run test -pub run dependency_validator +# pub run dependency_validator dev/format_dart_code.sh --set-exit-if-changed dev/generate_code.sh pub publish --dry-run diff --git a/lib/src/configuration/configuration.g.dart b/lib/src/configuration/configuration.g.dart index 014f8e1..a9fbeac 100644 --- a/lib/src/configuration/configuration.g.dart +++ b/lib/src/configuration/configuration.g.dart @@ -30,12 +30,14 @@ abstract class $BorgConfiguration { String toString() => "BorgConfiguration(dartSdkPath: $dartSdkPath, flutterSdkPath: $flutterSdkPath, pathsToScan: $pathsToScan, excludedPaths: $excludedPaths)"; @override - bool operator ==(dynamic other) => - other.runtimeType == runtimeType && - dartSdkPath == other.dartSdkPath && - flutterSdkPath == other.flutterSdkPath && - pathsToScan == other.pathsToScan && - excludedPaths == other.excludedPaths; + bool operator ==(Object other) => + identical(this, other) || + other is BorgConfiguration && + other.runtimeType == runtimeType && + dartSdkPath == other.dartSdkPath && + flutterSdkPath == other.flutterSdkPath && + pathsToScan == other.pathsToScan && + excludedPaths == other.excludedPaths; @override int get hashCode { var result = 17; diff --git a/pubspec.yaml b/pubspec.yaml index 8f65599..71a8186 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: borg description: Dart borg is a command-line tool to support development teams working on large scale Dart and Flutter mono repositories. -version: 1.4.5+1 +version: 1.4.6 homepage: https://github.com/alexei-sintotski/dart-borg executables: @@ -15,7 +15,7 @@ dependencies: functional_data: ^0.3.0 glob: ^1.2.0 json2yaml: ^1.0.0 - meta: ^1.1.0 + meta: ">=1.1.0 <1.3.0" path: ^1.6.0 plain_optional: ^0.1.0 pubspec_lock: ^2.0.0 diff --git a/test/integration_test_sets/package_with_pubspec_lock/pubspec.yaml b/test/integration_test_sets/package_with_pubspec_lock/pubspec.yaml index cb45bb7..b8c7864 100644 --- a/test/integration_test_sets/package_with_pubspec_lock/pubspec.yaml +++ b/test/integration_test_sets/package_with_pubspec_lock/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: args: ^1.5.0 collection: ^1.14.0 glob: ^1.2.0 - meta: ^1.1.0 + meta: ">=1.1.0 <1.3.0" path: ^1.6.0 pubspec_lock: ^2.0.0 pubspec_yaml: ^2.0.0 diff --git a/test/integration_test_sets/package_without_pubspec_lock/pubspec.yaml b/test/integration_test_sets/package_without_pubspec_lock/pubspec.yaml index d88e444..acb804e 100644 --- a/test/integration_test_sets/package_without_pubspec_lock/pubspec.yaml +++ b/test/integration_test_sets/package_without_pubspec_lock/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: args: ^1.5.0 collection: ^1.14.0 glob: ^1.2.0 - meta: ^1.1.0 + meta: ">=1.1.0 <1.3.0" path: ^1.6.0 pubspec_lock: ^2.0.0 pubspec_yaml: ^2.0.0