Merge pull request #46 from DrMarcII/master
Dependency cleanup.
diff --git a/lib/async_helpers.dart b/lib/async_helpers.dart
index 540d2fc..d9e34b8 100644
--- a/lib/async_helpers.dart
+++ b/lib/async_helpers.dart
@@ -4,8 +4,8 @@
library webdriver.async_helpers;
-import 'dart:async';
-import 'package:matcher/matcher.dart';
+import 'dart:async' show Completer, Future;
+import 'package:matcher/matcher.dart' show expect, isNotNull;
const defaultInterval = const Duration(milliseconds: 500);
const defaultTimeout = const Duration(seconds: 5);
diff --git a/lib/webdriver.dart b/lib/webdriver.dart
index 00aa2c6..d7b6af4 100644
--- a/lib/webdriver.dart
+++ b/lib/webdriver.dart
@@ -4,17 +4,21 @@
library webdriver;
-import 'dart:async';
-import 'dart:collection';
-import 'dart:convert';
-import 'dart:io';
+import 'dart:async' show Future, Stream, StreamController;
+import 'dart:collection' show UnmodifiableMapView;
+import 'dart:convert' show JSON, UTF8;
+import 'dart:io'
+ show
+ ContentType,
+ HttpClient,
+ HttpClientRequest,
+ HttpClientResponse,
+ HttpHeaders;
import 'dart:math' show Point, Rectangle;
-export 'dart:math' show Point, Rectangle;
-import 'package:crypto/crypto.dart';
-import 'package:matcher/matcher.dart';
+import 'package:crypto/crypto.dart' show CryptoUtils;
-import 'async_helpers.dart';
+import 'async_helpers.dart' show Lock, waitFor;
export 'async_helpers.dart' show waitFor;
part 'src/alert.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 71d304a..2fa26c2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,10 +6,10 @@
and as such, require the use of the WebDriver remote server.
homepage: https://github.com/google/webdriver.dart
environment:
- sdk: '>=1.9.0-dev.4.0 <2.0.0'
+ sdk: '>=1.9.0-dev.5.0 <2.0.0'
dependencies:
crypto: '^0.9.0'
matcher: '^0.11.4'
dev_dependencies:
path: '^1.3.2'
- unittest: '^0.11.5'
+ unittest: '^0.11.5+2'
diff --git a/test/async_helpers_test.dart b/test/async_helpers_test.dart
index 23b6fd2..763dcf6 100644
--- a/test/async_helpers_test.dart
+++ b/test/async_helpers_test.dart
@@ -4,7 +4,7 @@
library webdriver_test.async_helpers;
-import 'dart:async';
+import 'dart:async' show Future;
import 'package:unittest/unittest.dart';
import 'package:webdriver/async_helpers.dart';
diff --git a/test/src/window_test.dart b/test/src/window_test.dart
index 482ceeb..0e87423 100644
--- a/test/src/window_test.dart
+++ b/test/src/window_test.dart
@@ -4,6 +4,8 @@
library webdriver_test.window;
+import 'dart:math' show Point, Rectangle;
+
import 'package:unittest/unittest.dart';
import 'package:webdriver/webdriver.dart';
diff --git a/test/test_util.dart b/test/test_util.dart
index c218b0b..ad7c940 100644
--- a/test/test_util.dart
+++ b/test/test_util.dart
@@ -4,19 +4,20 @@
library webdriver_test_util;
-import 'dart:async';
-import 'dart:io' hide Platorm;
-import 'dart:io' as io show Platform;
+import 'dart:async' show Future;
+import 'dart:io' show FileSystemEntity, Platform;
+import 'dart:math' show Point, Rectangle;
import 'package:path/path.dart' as path;
-import 'package:unittest/unittest.dart';
-import 'package:webdriver/webdriver.dart';
+import 'package:matcher/matcher.dart' show Matcher, isInstanceOf;
+import 'package:webdriver/webdriver.dart'
+ show Capabilities, WebDriver, WebElement;
final Matcher isWebElement = new isInstanceOf<WebElement>();
final Matcher isRectangle = new isInstanceOf<Rectangle<int>>();
final Matcher isPoint = new isInstanceOf<Point<int>>();
-bool isRunningOnTravis() => io.Platform.environment['TRAVIS'] == 'true';
+bool isRunningOnTravis() => Platform.environment['TRAVIS'] == 'true';
String get testPagePath {
if (_testPagePath == null) {
@@ -39,7 +40,7 @@
Future<WebDriver> createTestDriver({Map additionalCapabilities}) {
Map capabilities = Capabilities.chrome;
- Map env = io.Platform.environment;
+ Map env = Platform.environment;
Map chromeOptions = {};
