diff --git a/CHANGELOG.md b/CHANGELOG.md
index a16b333..a315133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 2.2.0
+
+* Declare compatibility with Dart 2 stable
+* Update dependency on `package:test` to 1.0
+
 ### 2.1.2
 
 * Relax sdk upper bound constraint to  '<2.0.0' to allow 'edge' dart sdk use.
diff --git a/lib/src/testing/fake_platform.dart b/lib/src/testing/fake_platform.dart
index 062930d..3626d54 100644
--- a/lib/src/testing/fake_platform.dart
+++ b/lib/src/testing/fake_platform.dart
@@ -62,11 +62,11 @@
       pathSeparator: map['pathSeparator'],
       operatingSystem: map['operatingSystem'],
       localHostname: map['localHostname'],
-      environment: map['environment'],
+      environment: map['environment'].cast<String, String>(),
       executable: map['executable'],
       resolvedExecutable: map['resolvedExecutable'],
       script: Uri.parse(map['script']),
-      executableArguments: map['executableArguments'],
+      executableArguments: map['executableArguments'].cast<String>(),
       packageRoot: map['packageRoot'],
       packageConfig: map['packageConfig'],
       version: map['version'],
diff --git a/pubspec.yaml b/pubspec.yaml
index a841972..1209014 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,12 +1,12 @@
 name: platform
-version: 2.1.2
+version: 2.2.0
 authors:
 - Todd Volkert <tvolkert@google.com>
 description: A pluggable, mockable platform abstraction for Dart.
 homepage: https://github.com/google/platform.dart
 
 dev_dependencies:
-  test: ^0.12.10
+  test: ^1.0.0
 
 environment:
-  sdk: '>=1.24.0-dev.0.0 <2.0.0'
+  sdk: '>=1.24.0-dev.0.0 <3.0.0'