misc: require Dart 2, fix deprecations, prepare to release 1.0.4

.gitignore

@@ -1,9 +1,3 @@
-.buildlog
-.DS_Store
-.idea
-.pub/
-.settings/
-build/
-packages
+.dart_tool/
 .packages
 pubspec.lock

.travis.yml

@@ -1,17 +1,18 @@
 language: dart
 sudo: false
 dart:
-  - stable
+  #- stable
   - dev
 dart_task:
   - test: -p vm
     xvfb: false
-  - test: -p firefox
+  # Set concurrency to 1 to avoid flakes on Travis
+  - test: -p firefox -j 1
   - dartanalyzer
 
 matrix:
   include:
-  - dart: stable
+  - dart: dev
     dart_task: dartfmt
 
 # Only building master means that we don't run two builds for each pull request.

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+* Now requires Dart 2.
+
 ## 1.0.3
 
 * Work around an inference bug in the new common front-end.

lib/src/evaluator.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:collection/collection.dart';
-
 import 'ast.dart';
 import 'visitor.dart';
 
@@ -17,7 +15,7 @@ class Evaluator implements Visitor<bool> {
 
   Evaluator(semantics)
       : _semantics = semantics is Iterable
-            ? DelegatingIterable.typed(semantics.toSet()).contains
+            ? semantics.toSet().contains
             : semantics as _Semantics;
 
   bool visitVariable(VariableNode node) => _semantics(node.name);

pubspec.yaml

@@ -1,16 +1,15 @@
 name: boolean_selector
-version: 1.0.3
+version: 1.0.4
 description: A flexible syntax for boolean expressions.
 author: Dart Team <[email protected]>
 homepage: https://github.com/dart-lang/boolean_selector
 
 environment:
-  sdk: '>=1.8.0 <2.0.0'
+  sdk: '>=2.0.0-dev.58 <3.0.0'
 
 dependencies:
-  collection: '^1.5.0'
   source_span: '^1.0.0'
   string_scanner: '>=0.1.1 <2.0.0'
 
 dev_dependencies:
-  test: '^0.12.0'
+  test: ^1.2.0

test/parser_test.dart

@@ -8,16 +8,16 @@ import 'package:boolean_selector/src/ast.dart';
 import 'package:boolean_selector/src/parser.dart';
 
 /// A matcher that asserts that a value is a [ConditionalNode].
-Matcher _isConditionalNode = new isInstanceOf<ConditionalNode>();
+final _isConditionalNode = new TypeMatcher<ConditionalNode>();
 
 /// A matcher that asserts that a value is an [OrNode].
-Matcher _isOrNode = new isInstanceOf<OrNode>();
+final _isOrNode = new TypeMatcher<OrNode>();
 
 /// A matcher that asserts that a value is an [AndNode].
-Matcher _isAndNode = new isInstanceOf<AndNode>();
+final _isAndNode = new TypeMatcher<AndNode>();
 
 /// A matcher that asserts that a value is a [NotNode].
-Matcher _isNotNode = new isInstanceOf<NotNode>();
+final _isNotNode = new TypeMatcher<NotNode>();
 
 void main() {
   group("parses a conditional expression", () {