Merge pull request #9 from dart-lang/review_nits
Review fixes.
diff --git a/drone.sh b/drone.sh
deleted file mode 100755
index 62887e9..0000000
--- a/drone.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-set -o xtrace
-
-pub get
-dart test/test_when.dart
-
-# TODO: dartanalyzer on all libraries
-
-# Install dart_coveralls; gather and send coverage data.
-if [ "$REPO_TOKEN" ]; then
- export PATH="$PATH":"~/.pub-cache/bin"
-
- echo
- echo "Installing dart_coveralls"
- pub global activate dart_coveralls
-
- echo
- echo "Running code coverage report"
- # --debug for verbose logging
- pub global run dart_coveralls report --token $REPO_TOKEN --retry 3 test/test_when.dart
-fi
\ No newline at end of file
diff --git a/example/read_json_file.dart b/example/read_json_file.dart
index 0582604..9d3f0e2 100644
--- a/example/read_json_file.dart
+++ b/example/read_json_file.dart
@@ -1,3 +1,6 @@
+// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
+// 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.
library when.example.read_json_file;
@@ -16,7 +19,7 @@
/// Reads and decodes JSON from [path] synchronously.
///
/// If [path] does not exist, returns the result of calling [onAbsent].
-readJsonFileSync(String path, {onAbsent()}) => _readJsonFile(
+dynamic readJsonFileSync(String path, {onAbsent()}) => _readJsonFile(
path, onAbsent, (file) => file.existsSync(),
(file) => file.readAsStringSync());
diff --git a/lib/when.dart b/lib/when.dart
index 8b429dc..8469d2d 100644
--- a/lib/when.dart
+++ b/lib/when.dart
@@ -24,7 +24,7 @@
/// [onComplete] is then called synchronously.
///
/// The captured value is then returned.
-when(callback, {onSuccess(result), onError, onComplete}) {
+dynamic when(callback, {onSuccess(result), onError, onComplete}) {
var result, hasResult = false;
try {
diff --git a/pubspec.yaml b/pubspec.yaml
index 0148327..f549ee3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,5 +5,7 @@
Sean Eagan <seaneagan1@gmail.com>
description: Register callbacks on code which is conditionally sync or async.
homepage: https://github.com/dart-lang/when
+environment:
+ sdk: '>=1.0.0 <2.0.0'
dev_dependencies:
unittest: '>=0.11.4 <0.12.0'
diff --git a/tool/travis.sh b/tool/travis.sh
index 1362cbd..5ac7ef5 100755
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -10,6 +10,7 @@
# Verify that the libraries are error free.
dartanalyzer --fatal-warnings \
lib/when.dart \
+ example/read_json_file.dart \
test/when_test.dart
# Run the tests.
