From 314f1514a5cd1b8ff7af12ef04ac2e84fe5a12cd Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 20 Jun 2017 13:15:26 -0700 Subject: [PATCH 1/3] Fix broken package and stop grinder from doing this to us again --- CHANGELOG.md | 5 +++++ lib/src/model.dart | 2 -- tool/grind.dart | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd28a3741d..b7f249ab4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.13.1 +* Remove unnecessary dependency on meta. +* Drop --force from pub publish arguments to avoid publishing more broken + packages. + ## 0.13.0 * Fixed case where inherited members could be linked to the wrong mixin (#1434) * Added broken link detection to the search index. diff --git a/lib/src/model.dart b/lib/src/model.dart index 899934ff48..345aa16d82 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -24,7 +24,6 @@ import 'package:analyzer/src/generated/resolver.dart' import 'package:analyzer/src/generated/utilities_dart.dart' show ParameterKind; import 'package:analyzer/src/dart/element/member.dart' show Member; import 'package:collection/collection.dart'; -import 'package:meta/meta.dart'; import 'package:path/path.dart' as p; import 'package:tuple/tuple.dart'; @@ -3246,7 +3245,6 @@ class Package extends Nameable implements Documentable { final List _libraries = []; // All library objects related to this package; a superset of _libraries. - @visibleForTesting final Map allLibraries = new Map(); // Objects to keep track of warnings. diff --git a/tool/grind.dart b/tool/grind.dart index bbdeba2b35..46bdaafb99 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -176,7 +176,7 @@ indexResources() { @Task('Publish to pub.dartlang') @Depends(checkChangelogHasVersion, checkVersionMatches) publish() async { - await run('pub', arguments: ['publish', '--force']); + await run('pub', arguments: ['publish']); } @Task('Run all the tests.') From c5aac77680b2bbd59024da6208e5f57d648dde8c Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 20 Jun 2017 13:16:38 -0700 Subject: [PATCH 2/3] update version --- lib/dartdoc.dart | 2 +- pubspec.yaml | 2 +- testing/test_package_docs/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart index b31a60e84f..b2bb91d475 100644 --- a/lib/dartdoc.dart +++ b/lib/dartdoc.dart @@ -46,7 +46,7 @@ export 'src/sdk.dart'; const String name = 'dartdoc'; // Update when pubspec version changes. -const String version = '0.13.0'; +const String version = '0.13.1'; final String defaultOutDir = path.join('doc', 'api'); diff --git a/pubspec.yaml b/pubspec.yaml index 9a942b6eb3..f9c57299d2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dartdoc # Also update the `version` field in lib/dartdoc.dart. -version: 0.13.0 +version: 0.13.1 author: Dart Team description: A documentation generator for Dart. homepage: https://github.com/dart-lang/dartdoc diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html index 182fe5bf4e..a3683c5e44 100644 --- a/testing/test_package_docs/index.html +++ b/testing/test_package_docs/index.html @@ -4,7 +4,7 @@ - + test_package - Dart API docs From a61fa44cae8d864eac890bded16cb32d8e8632d0 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 20 Jun 2017 13:28:34 -0700 Subject: [PATCH 3/3] Change to minor update --- CHANGELOG.md | 2 +- lib/dartdoc.dart | 2 +- pubspec.yaml | 2 +- testing/test_package_docs/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7f249ab4f..dc35d4079c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.13.1 +## 0.13.0+1 * Remove unnecessary dependency on meta. * Drop --force from pub publish arguments to avoid publishing more broken packages. diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart index b2bb91d475..46cac8d567 100644 --- a/lib/dartdoc.dart +++ b/lib/dartdoc.dart @@ -46,7 +46,7 @@ export 'src/sdk.dart'; const String name = 'dartdoc'; // Update when pubspec version changes. -const String version = '0.13.1'; +const String version = '0.13.0+1'; final String defaultOutDir = path.join('doc', 'api'); diff --git a/pubspec.yaml b/pubspec.yaml index f9c57299d2..0a8aed27b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dartdoc # Also update the `version` field in lib/dartdoc.dart. -version: 0.13.1 +version: 0.13.0+1 author: Dart Team description: A documentation generator for Dart. homepage: https://github.com/dart-lang/dartdoc diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html index a3683c5e44..43f59c45cc 100644 --- a/testing/test_package_docs/index.html +++ b/testing/test_package_docs/index.html @@ -4,7 +4,7 @@ - + test_package - Dart API docs