From 4c3b30c2f0538b93d97822762ac20705ea8a7e8b Mon Sep 17 00:00:00 2001 From: Travis Sanderson Date: Thu, 12 Jan 2017 13:31:15 -0600 Subject: [PATCH] Revert "Enable generics for waitFor and require Dart 1.21+ in the pubspec SDK range" (#135) --- lib/support/async.dart | 6 +++--- pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/support/async.dart b/lib/support/async.dart index 875e750f..e20a2600 100644 --- a/lib/support/async.dart +++ b/lib/support/async.dart @@ -25,11 +25,11 @@ const defaultTimeout = const Duration(seconds: 5); const clock = const Clock(); -Future waitFor(T condition(), +Future/**/ waitFor/**/(/*=T*/ condition(), {matcher: null, Duration timeout: defaultTimeout, Duration interval: defaultInterval}) => - clock.waitFor(condition, + clock.waitFor/**/(condition, matcher: matcher, timeout: timeout, interval: interval); class Clock { @@ -50,7 +50,7 @@ class Clock { /// is returned. Otherwise, if [condition] throws, then that exception is /// rethrown. If [condition] doesn't throw then an [expect] exception is /// thrown. - Future waitFor(T condition(), + Future/**/ waitFor/**/(/*=T*/ condition(), {matcher: null, Duration timeout: defaultTimeout, Duration interval: defaultInterval}) async { diff --git a/pubspec.yaml b/pubspec.yaml index f1f5cacc..f850f663 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ description: > and as such, require the use of the WebDriver remote server. homepage: https://github.com/google/webdriver.dart environment: - sdk: '>=1.21.0 <2.0.0' + sdk: '>=1.10.0 <2.0.0' dependencies: archive: '^1.0.0' matcher: '^0.12.0'