Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate off scheduled_test #15

Merged
merged 4 commits into from
Sep 15, 2017
Merged

Migrate off scheduled_test #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2086b8e
Fix generic method syntax
kevmoo Sep 15, 2017
ae01fef
Migrate to pkg/test_descriptor, stop using pkg/scheduled_test
kevmoo Sep 15, 2017
f2d0145
fix import ordering
kevmoo Sep 15, 2017
8c8ce45
Use ^ syntax for dependency constraints
kevmoo Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.1.5

* Require Dart 1.23.0.

## 1.1.4

* Throw an exception when listing globs whose initial paths don't exist in
Expand Down
2 changes: 1 addition & 1 deletion lib/src/ast.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class SequenceNode extends AstNode {
return new OptionsNode(sequences.map((sequence) {
// Combine any adjacent LiteralNodes in [sequence].
return new SequenceNode(
sequence.fold/*<List<AstNode>>*/([], (combined, node) {
sequence.fold<List<AstNode>>([], (combined, node) {
if (combined.isEmpty ||
combined.last is! LiteralNode ||
node is! LiteralNode) {
Expand Down
5 changes: 2 additions & 3 deletions lib/src/list_tree.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// 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 'dart:io';
import 'dart:async';
import 'dart:io';

import 'package:async/async.dart';
import 'package:path/path.dart' as p;
Expand Down Expand Up @@ -193,8 +193,7 @@ class ListTree {
List<FileSystemEntity> listSync({String root, bool followLinks: true}) {
if (root == null) root = '.';

// TODO(nweiz): Remove the explicit annotation when sdk#26139 is fixed.
var result = _trees.keys.expand/*<FileSystemEntity>*/((rootDir) {
var result = _trees.keys.expand((rootDir) {
var dir = rootDir == '.' ? root : rootDir;
return _trees[rootDir].listSync(dir, followLinks: followLinks);
});
Expand Down
12 changes: 6 additions & 6 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: glob
version: 1.1.4
version: 1.1.5-dev
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there actually a breaking change? I didn't see one...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope. Hence just a minor bump. Since we update the SDK constraint...also pre-release

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh sheesh sorry I read that as a breaking change for some dumb reason, LGTM

author: "Dart Team <misc@dartlang.org>"
homepage: https://github.com/dart-lang/glob
description: Bash-style filename globbing.
dependencies:
async: "^1.2.0"
collection: ">=1.1.0 <2.0.0"
path: ">=1.3.0 <2.0.0"
collection: "^1.1.0"
path: "^1.3.0"
string_scanner: ">=0.1.0 <2.0.0"
dev_dependencies:
test: ">=0.12.0 <0.13.0"
scheduled_test: ">=0.12.0 <0.13.0"
test: "^0.12.0"
test_descriptor: "^1.0.0"
environment:
sdk: ">=1.12.0 <2.0.0"
sdk: ">=1.23.0 <2.0.0"
Loading