fix: go Dart-2 only, update dependencies, update deprecated test usage
diff --git a/.travis.yml b/.travis.yml
index c2842f8..dc9b459 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,14 @@
language: dart
-sudo: false
dart:
- dev
- - stable
dart_task:
- test: --platform vm
xvfb: false
- test: --platform firefox -j 1
- dartanalyzer --fatal-warnings
-
-matrix:
- include:
- - dart: stable
- dart_task: dartfmt
+ - dartfmt
# 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 3212e34..40f4156 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.8
+
+* Require Dart `>=2.0.0-dev.65`.
+
## 0.10.7
* Bug fix: Make bit shifts work at bitwidth boundaries. Previously,
diff --git a/analysis_options.yaml b/analysis_options.yaml
deleted file mode 100644
index a10d4c5..0000000
--- a/analysis_options.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-analyzer:
- strong-mode: true
diff --git a/pubspec.yaml b/pubspec.yaml
index d794eb1..ad53ed4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,9 +1,11 @@
name: fixnum
-version: 0.10.7
+version: 0.10.8-dev
author: Dart Team <misc@dartlang.org>
description: Library for 32- and 64-bit signed fixed-width integers.
homepage: https://github.com/dart-lang/fixnum
-dev_dependencies:
- test: ^0.12.0
+
environment:
- sdk: ">=1.8.3 <2.0.0"
+ sdk: ">=2.0.0-dev.65 <2.0.0"
+
+dev_dependencies:
+ test: ^1.2.0
diff --git a/test/int32_test.dart b/test/int32_test.dart
index afa7eeb..5598638 100644
--- a/test/int32_test.dart
+++ b/test/int32_test.dart
@@ -108,7 +108,7 @@
() => new Int32(17) ~/ Int32.ZERO,
// with dart2js, `UnsupportedError` is thrown
// on the VM: IntegerDivisionByZeroException
- throwsA(anyOf(new isInstanceOf<IntegerDivisionByZeroException>(),
+ throwsA(anyOf(new TypeMatcher<IntegerDivisionByZeroException>(),
isUnsupportedError)));
expect(() => new Int32(17) ~/ null, throwsArgumentError);
});
@@ -383,8 +383,7 @@
checkInt(4294967295);
checkInt(4294967296);
expect(() => Int32.parseRadix('xyzzy', -1), throwsArgumentError);
- expect(() => Int32.parseRadix('plugh', 10),
- throwsA(new isInstanceOf<FormatException>()));
+ expect(() => Int32.parseRadix('plugh', 10), throwsFormatException);
});
test("parseRadix", () {
diff --git a/test/int64_test.dart b/test/int64_test.dart
index 8106c2e..51f268d 100644
--- a/test/int64_test.dart
+++ b/test/int64_test.dart
@@ -227,13 +227,13 @@
expect(new Int64(829893893) ~/ new Int64(1919), new Int32(432461));
expect(new Int64(829893893) ~/ 1919, new Int32(432461));
expect(() => new Int64(1) ~/ Int64.ZERO,
- throwsA(new isInstanceOf<IntegerDivisionByZeroException>()));
+ throwsA(new TypeMatcher<IntegerDivisionByZeroException>()));
expect(Int64.MIN_VALUE ~/ new Int64(2),
new Int64.fromInts(0xc0000000, 0x00000000));
expect(Int64.MIN_VALUE ~/ new Int64(1), Int64.MIN_VALUE);
expect(Int64.MIN_VALUE ~/ new Int64(-1), Int64.MIN_VALUE);
expect(() => new Int64(17) ~/ Int64.ZERO,
- throwsA(new isInstanceOf<IntegerDivisionByZeroException>()));
+ throwsA(new TypeMatcher<IntegerDivisionByZeroException>()));
argumentErrorTest("~/", (a, b) => a ~/ b);
});
@@ -788,8 +788,7 @@
checkInt(-4294967295);
checkInt(-4294967296);
expect(() => Int64.parseRadix('xyzzy', -1), throwsArgumentError);
- expect(() => Int64.parseRadix('plugh', 10),
- throwsA(new isInstanceOf<FormatException>()));
+ expect(() => Int64.parseRadix('plugh', 10), throwsFormatException);
});
test("parseHex", () {
