From 168ad5dc4d24c5d3bb3ab2e75ee192c8a4a8bbcf Mon Sep 17 00:00:00 2001 From: Michael Thomsen Date: Mon, 9 Nov 2020 19:02:10 +0100 Subject: [PATCH] Roll engine and fix pubspecs that do not have a Dart SDK constraint (#70078) --- bin/internal/engine.version | 2 +- dev/benchmarks/metrics_center/lib/google_benchmark.dart | 4 ++++ dev/benchmarks/metrics_center/pubspec.yaml | 3 +++ dev/bots/analyze-sample-code.dart | 2 ++ dev/tools/dartdoc.dart | 2 ++ .../flutter_tools/lib/src/commands/update_packages.dart | 2 ++ .../hermetic/analyze_continuously_test.dart | 8 +++++--- .../integration.shard/test_data/stepping_project.dart | 4 ++++ 8 files changed, 23 insertions(+), 4 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 80fbe8a24fc..02c549ef1dc 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -0f7cdca65fba5619c02d00bb5faa40a4f1950df7 +3cf292226986c992090b3342b86e54c0f4ba7f75 diff --git a/dev/benchmarks/metrics_center/lib/google_benchmark.dart b/dev/benchmarks/metrics_center/lib/google_benchmark.dart index 701b1e0d679..9c7c2aa11ed 100644 --- a/dev/benchmarks/metrics_center/lib/google_benchmark.dart +++ b/dev/benchmarks/metrics_center/lib/google_benchmark.dart @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// This file uses Dart 2.12 semantics. This is needed as we can't upgrade +// the SDK constraint to `>=2.12.0-0` before the deps are ready. +// @dart=2.12 + import 'dart:convert'; import 'dart:io'; diff --git a/dev/benchmarks/metrics_center/pubspec.yaml b/dev/benchmarks/metrics_center/pubspec.yaml index 086f7eb386a..94bb0fef554 100644 --- a/dev/benchmarks/metrics_center/pubspec.yaml +++ b/dev/benchmarks/metrics_center/pubspec.yaml @@ -1,5 +1,8 @@ name: metrics_center +environment: + sdk: '>=2.10.0 <3.0.0' + dependencies: args: 1.6.0 crypto: 2.1.5 diff --git a/dev/bots/analyze-sample-code.dart b/dev/bots/analyze-sample-code.dart index 6cd35610407..906932c1d52 100644 --- a/dev/bots/analyze-sample-code.dart +++ b/dev/bots/analyze-sample-code.dart @@ -491,6 +491,8 @@ class SampleChecker { final File analysisOptions = File(path.join(directory.path, 'analysis_options.yaml'))..createSync(recursive: true); pubSpec.writeAsStringSync(''' name: analyze_sample_code +environment: + sdk: '>=2.10.0 <3.0.0' dependencies: flutter: sdk: flutter diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart index a726bb4fd56..e20cd98fa42 100644 --- a/dev/tools/dartdoc.dart +++ b/dev/tools/dartdoc.dart @@ -56,6 +56,8 @@ Future main(List arguments) async { buf.writeln('homepage: https://flutter.dev'); // TODO(dnfield): Re-factor for proper versioning, https://github.com/flutter/flutter/issues/55409 buf.writeln('version: 0.0.0'); + buf.writeln('environment:'); + buf.writeln(" sdk: '>=2.10.0 <3.0.0'"); buf.writeln('dependencies:'); for (final String package in findPackageNames()) { buf.writeln(' $package:'); diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index a343c965a91..76c1932ce7f 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -1259,6 +1259,8 @@ String _generateFakePubspec(Iterable dependencies) { final StringBuffer result = StringBuffer(); final StringBuffer overrides = StringBuffer(); result.writeln('name: flutter_update_packages'); + result.writeln('environment:'); + result.writeln(" sdk: '>=2.10.0 <3.0.0'"); result.writeln('dependencies:'); overrides.writeln('dependency_overrides:'); if (_kManuallyPinnedDependencies.isNotEmpty) { diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart index e578843b5f2..2b9f93b9c3c 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart @@ -4,20 +4,20 @@ import 'dart:async'; +import 'package:file/memory.dart'; import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/base/common.dart'; -import 'package:flutter_tools/src/cache.dart'; -import 'package:mockito/mockito.dart'; -import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/terminal.dart'; +import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/analyze.dart'; import 'package:flutter_tools/src/dart/analysis.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/globals.dart' as globals; +import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; import '../../src/common.dart'; @@ -55,6 +55,8 @@ void main() { final File pubspecFile = fileSystem.file(fileSystem.path.join(directory.path, 'pubspec.yaml')); pubspecFile.writeAsStringSync(''' name: foo_project + environment: + sdk: '>=2.10.0 <3.0.0' '''); final File dartFile = fileSystem.file(fileSystem.path.join(directory.path, 'lib', 'main.dart')); diff --git a/packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart b/packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart index 21b49346eb4..15c2c30038e 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart +++ b/packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart @@ -8,6 +8,8 @@ class SteppingProject extends Project { @override final String pubspec = ''' name: test + environment: + sdk: '>=2.10.0 <3.0.0' dependencies: flutter: sdk: flutter @@ -62,6 +64,8 @@ class WebSteppingProject extends Project { @override final String pubspec = ''' name: test + environment: + sdk: '>=2.10.0 <3.0.0' dependencies: flutter: sdk: flutter