diff --git a/.gitignore b/.gitignore
index 5d53a96..49ce72d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
+.dart_tool/
 .packages
-.pub/
-build/
 pubspec.lock
diff --git a/.travis.yml b/.travis.yml
index 3c6ac28..9d8258c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,18 +9,13 @@
 - dev
 # See https://docs.travis-ci.com/user/languages/dart/ for details.
 dart_task:
-- test: --platform vm
-# Uncomment this line to run tests on the browser.
-# - test: --platform firefox
-
-# Only run one instance of the formatter and the analyzer, rather than running
-# them against each Dart version.
-matrix:
-  include:
-  - dart: dev
-    dart_task: dartfmt
-  - dart: dev
-    dart_task: dartanalyzer
+  - dartfmt
+  - dartanalyzer
+  # TODO: reinstate tests once https://github.com/dart-lang/http_retry/issues/6 is fixed
+  #  - test: --platform vm
+  #    xvfb: false
+  #  # Uncomment this line to run tests on the browser.
+  #  - test: --platform firefox
 
 # Only building master means that we don't run two builds for each pull request.
 branches:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f04571e..d7765f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
+## 0.1.1+2
+
+* Set max SDK version to `<3.0.0`, and adjust other dependencies.
+
 ## 0.1.1+1
 
-* Updated SDK version to 2.0.0-dev.17.0
+* Update SDK version to 2.0.0-dev.17.0.
 
 ## 0.1.1
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index a10d4c5..2e6cdca 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,2 +1 @@
 analyzer:
-  strong-mode: true
diff --git a/pubspec.yaml b/pubspec.yaml
index 30eeb26..d9261a7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,16 +1,17 @@
 name: http_retry
-version: 0.1.1+1
+version: 0.1.1+2
+
 description: HTTP client middleware that automatically retries requests.
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/http_retry
 
 environment:
-  sdk: '>=2.0.0-dev.17.0 <2.0.0'
+  sdk: '>=2.0.0-dev.17.0 <3.0.0'
 
 dependencies:
-  async: ">=1.2.0 <=3.0.0"
-  http: "^0.11.0"
+  async: ^2.0.7
+  http: ^0.11.0
 
 dev_dependencies:
-  fake_async: "^0.1.2"
-  test: "^0.12.0"
+  fake_async: ^0.1.2
+  test: ^1.2.0
diff --git a/test/http_retry_test.dart b/test/http_retry_test.dart
index 952e1f2..dc7bc19 100644
--- a/test/http_retry_test.dart
+++ b/test/http_retry_test.dart
@@ -82,7 +82,6 @@
   });
 
   test("doesn't retry a request where whenError() returns false", () async {
-    var count = 0;
     var client = new RetryClient(
         new MockClient(expectAsync1((request) async => throw "oh no")),
         whenError: (error, _) => error == "oh yeah",