Skip to content

Prepare for 0.20.2 and fix void problems #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 25, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 0.20.2
* Fix void problems (#1724)

## 0.20.1
* Remove name parameter from `@animation` parameter handling, with backwards compatibility
(#1715)
Expand Down
3 changes: 0 additions & 3 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
analyzer:
strong-mode: true
language:
enableGenericMethods: true
enablePreviewDart2: true
enableSuperMixins: true
exclude:
- 'doc/**'
Expand Down
2 changes: 1 addition & 1 deletion lib/dartdoc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class Dartdoc extends PackageBuilder {
Stream<String> get onCheckProgress => _onCheckProgress.stream;

@override
void logAnalysisErrors(Set<Source> sources) async {
Future<void> logAnalysisErrors(Set<Source> sources) async {
List<AnalysisErrorInfo> errorInfos = [];
// TODO(jcollins-g): figure out why sources can't contain includeExternals
// or embedded SDK components without having spurious(?) analysis errors.
Expand Down
6 changes: 3 additions & 3 deletions lib/src/io_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,21 @@ class MultiFutureTracker<T> {
///
/// That can be extremely brief and there's no longer a guarantee after that
/// point that another async task has not added a Future to the list.
void addFuture(Future<T> future) async {
Future<void> addFuture(Future<T> future) async {
_queue.add(future);
future.then((f) => _queue.remove(future));
await _waitUntil(parallel - 1);
}

/// Wait until fewer or equal to this many Futures are outstanding.
void _waitUntil(int max) async {
Future<void> _waitUntil(int max) async {
while (_queue.length > max) {
await Future.any(_queue);
}
}

/// Wait until all futures added so far have completed.
void wait() async => await _waitUntil(0);
Future<void> wait() async => await _waitUntil(0);
}

class SubprocessLauncher {
Expand Down
3 changes: 1 addition & 2 deletions lib/src/model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5505,7 +5505,7 @@ class PackageBuilder {

PackageBuilder(this.config);

void logAnalysisErrors(Set<Source> sources) {}
Future<void> logAnalysisErrors(Set<Source> sources) async {}

Future<PackageGraph> buildPackageGraph() async {
PackageMeta packageMeta = config.topLevelPackageMeta;
Expand Down Expand Up @@ -5608,7 +5608,6 @@ class PackageBuilder {
PerformanceLog log = new PerformanceLog(null);
AnalysisDriverScheduler scheduler = new AnalysisDriverScheduler(log);
AnalysisOptionsImpl options = new AnalysisOptionsImpl();
options.strongMode = true;
options.enableSuperMixins = true;
options.previewDart2 = true;

Expand Down
8 changes: 4 additions & 4 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "0.32.1"
version: "0.32.4"
args:
dependency: "direct main"
description:
Expand Down Expand Up @@ -154,7 +154,7 @@ packages:
name: front_end
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.1"
version: "0.1.4"
glob:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -231,7 +231,7 @@ packages:
name: kernel
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.1"
version: "0.3.4"
logging:
dependency: "direct main"
description:
Expand Down Expand Up @@ -492,4 +492,4 @@ packages:
source: hosted
version: "2.1.13"
sdks:
dart: ">=2.0.0-dev.59.0 <=2.0.0-dev.63.0.flutter-4c9689c1d2"
dart: ">=2.0.0-dev.59.0 <=2.0.0-dev.69.1"
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: dartdoc
# Also update the `version` field in lib/dartdoc.dart.
version: 0.20.1
version: 0.20.2
author: Dart Team <[email protected]>
description: A documentation generator for Dart.
homepage: https://github.com/dart-lang/dartdoc
environment:
sdk: '>=2.0.0-dev.59.0 <3.0.0'
sdk: '>=2.0.0-dev.69.1 <3.0.0'
dependencies:
analyzer: ^0.32.1
analyzer: ^0.32.4
args: '>=1.4.1 <2.0.0'
collection: ^1.2.0
front_end: ^0.1.1
Expand Down