Skip to content

[fuchsia_ctl] try to fix tree by adding dart version annotations #244

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

Merged
gaaclarke merged 1 commit into from
Nov 12, 2020
Merged

[fuchsia_ctl] try to fix tree by adding dart version annotations #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 28 additions & 35 deletions packages/fuchsia_ctl/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "12.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "0.39.6"
version: "0.40.6"
args:
dependency: "direct main"
description:
Expand All @@ -35,14 +35,21 @@ packages:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "1.0.5"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.3"
cli_util:
dependency: transitive
description:
name: cli_util
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0"
collection:
dependency: transitive
description:
Expand All @@ -63,21 +70,14 @@ packages:
name: coverage
url: "https://pub.dartlang.org"
source: hosted
version: "0.13.9"
version: "0.14.2"
crypto:
dependency: transitive
description:
name: crypto
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.4"
csslib:
dependency: transitive
description:
name: csslib
url: "https://pub.dartlang.org"
source: hosted
version: "0.16.1"
file:
dependency: "direct main"
description:
Expand All @@ -92,13 +92,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
html:
dependency: transitive
description:
name: html
url: "https://pub.dartlang.org"
source: hosted
version: "0.14.0+3"
http:
dependency: transitive
description:
Expand Down Expand Up @@ -154,14 +147,14 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.6"
version: "0.12.9"
meta:
dependency: "direct main"
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.8"
version: "1.2.3"
mime:
dependency: transitive
description:
Expand All @@ -176,13 +169,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "4.1.1"
multi_server_socket:
dependency: transitive
description:
name: multi_server_socket
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
node_interop:
dependency: transitive
description:
Expand Down Expand Up @@ -211,6 +197,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.3"
package_resolver:
dependency: transitive
description:
name: package_resolver
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.10"
path:
dependency: "direct main"
description:
Expand All @@ -219,12 +212,12 @@ packages:
source: hosted
version: "1.6.4"
pedantic:
dependency: transitive
dependency: "direct dev"
description:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.0"
version: "1.9.2"
platform:
dependency: transitive
description:
Expand Down Expand Up @@ -273,7 +266,7 @@ packages:
name: shelf_packages_handler
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "1.0.4"
shelf_static:
dependency: transitive
description:
Expand Down Expand Up @@ -343,21 +336,21 @@ packages:
name: test
url: "https://pub.dartlang.org"
source: hosted
version: "1.14.2"
version: "1.15.5"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.15"
version: "0.2.18+1"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.3"
version: "0.3.11+2"
typed_data:
dependency: transitive
description:
Expand All @@ -378,7 +371,7 @@ packages:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.0"
version: "1.2.0"
watcher:
dependency: transitive
description:
Expand All @@ -399,7 +392,7 @@ packages:
name: webkit_inspection_protocol
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.0+1"
version: "0.7.4"
yaml:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions packages/fuchsia_ctl/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ dependencies:

dev_dependencies:
mockito: ^4.1.1
pedantic: ^1.9.2
test: ^1.6.9
pedantic: 1.9.2
test: ^1.15.5
2 changes: 1 addition & 1 deletion packages/fuchsia_ctl/test/command_line_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2020 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.4

@goderbauer goderbauer Nov 12, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do you actually still need these opt-outs? I would have expected that upgrading package:test is enough...

@gaaclarke gaaclarke Nov 12, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

It was the first thing I tried, it didn't fix the issues without the upgrade. I just left them in without trying to remove it.

import 'dart:io';

import 'package:mockito/mockito.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/fuchsia_ctl/test/dev_finder_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2019 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.4
import 'dart:io';

import 'package:fuchsia_ctl/fuchsia_ctl.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/fuchsia_ctl/test/emulator_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2019 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.4
import 'package:file/memory.dart';
import 'package:mockito/mockito.dart';
import 'package:test/test.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/fuchsia_ctl/test/image_paver_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2019 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.4
import 'dart:async';
import 'dart:io';

Expand Down
2 changes: 1 addition & 1 deletion packages/fuchsia_ctl/test/logger_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2020 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.4
import 'dart:io';

import 'package:file/memory.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/fuchsia_ctl/test/package_server_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2019 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.4
import 'dart:io' show ProcessResult;
import 'dart:math' show Random;

Expand Down
2 changes: 1 addition & 1 deletion packages/fuchsia_ctl/test/ssh_client_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2019 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.4
import 'dart:async';

import 'package:file/file.dart';
Expand Down
1 change: 1 addition & 0 deletions packages/fuchsia_ctl/test/ssh_key_manager_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// @dart = 2.4
import 'dart:io';

import 'package:file/file.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/fuchsia_ctl/test/tar_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2020 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.4
import 'dart:async';
import 'dart:io';

Expand Down