Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

NNBD migration for //testing #34766

Merged
merged 3 commits into from
Jul 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -476,10 +476,10 @@ deps = {
Var('github_git') + '/google/file.dart.git' + '@' + '427bb20ccc852425d67f2880da2a9b4707c266b4', # 6.1.0

'src/third_party/pkg/flutter_packages':
Var('github_git') + '/flutter/packages.git' + '@' + 'a19eca7fe2660c71acf5928a275deda1da318c50', # various
Var('github_git') + '/flutter/packages.git' + '@' + '26990a2f75ab2028c3c77ffc869db11d6d866d18', # various

'src/third_party/pkg/gcloud':
Var('github_git') + '/dart-lang/gcloud.git' + '@' + '92a33a9d95ea94a4354b052a28b98088d660e0e7', # 0.8.0-dev
Var('github_git') + '/dart-lang/gcloud.git' + '@' + 'a5276b85c4714378e84b1fb478b8feeeb686ac26', # 0.8.6-dev

'src/third_party/pkg/googleapis':
Var('github_git') + '/google/googleapis.dart.git' + '@' + '07f01b7aa6985e4cafd0fd4b98724841bc9e85a1', # various
Expand Down
14 changes: 6 additions & 8 deletions testing/benchmark/bin/parse_and_send.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.6

import 'dart:convert';
import 'dart:io';

Expand All @@ -13,7 +11,7 @@ import 'package:path/path.dart' as p;

Future<ProcessResult> runGit(
List<String> args, {
String processWorkingDir,
String? processWorkingDir,
}) async {
return Process.run(
'git',
Expand Down Expand Up @@ -54,8 +52,8 @@ Future<PointsAndDate> parse(String jsonFileName) async {
final List<FlutterEngineMetricPoint> points = <FlutterEngineMetricPoint>[];
for (final MetricPoint rawPoint in rawPoints) {
points.add(FlutterEngineMetricPoint(
rawPoint.tags[kNameKey],
rawPoint.value,
rawPoint.tags[kNameKey]!,
rawPoint.value!,
gitRevision,
moreTags: rawPoint.tags,
));
Expand All @@ -70,13 +68,13 @@ Future<FlutterDestination> connectFlutterDestination() async {
final bool isTesting = env['IS_TESTING'] == 'true';
if (env.containsKey(kTokenPath) && env.containsKey(kGcpProject)) {
return FlutterDestination.makeFromAccessToken(
File(env[kTokenPath]).readAsStringSync(),
env[kGcpProject],
File(env[kTokenPath]!).readAsStringSync(),
env[kGcpProject]!,
isTesting: isTesting,
);
}
return FlutterDestination.makeFromCredentialsJson(
jsonDecode(Platform.environment['BENCHMARK_GCP_CREDENTIALS'])
jsonDecode(Platform.environment['BENCHMARK_GCP_CREDENTIALS']!)
as Map<String, dynamic>,
isTesting: isTesting,
);
Expand Down
5 changes: 1 addition & 4 deletions testing/benchmark/test/parse_and_send_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.6

import 'dart:io';

import 'package:litetest/litetest.dart';
Expand All @@ -27,8 +25,7 @@ void main() {
expect(sha1re.hasMatch(gitLog[0]), true);

// Check that gitLog[1] is an int
final int secondsSinceEpoch = int.tryParse(gitLog[1]);
expect(secondsSinceEpoch, isNotNull);
final int secondsSinceEpoch = int.parse(gitLog[1]);

// Check that gitLog[1] is a sensible Unix Epoch
final int millisecondsSinceEpoch = secondsSinceEpoch * 1000;
Expand Down
1 change: 0 additions & 1 deletion testing/symbols/verify_exported.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.6
import 'dart:convert';
import 'dart:io';

Expand Down