Roll engine and fix pubspecs that do not have a Dart SDK constraint (#70078)
This commit is contained in:
parent
d18bd9a5bb
commit
168ad5dc4d
@ -1 +1 @@
|
|||||||
0f7cdca65fba5619c02d00bb5faa40a4f1950df7
|
3cf292226986c992090b3342b86e54c0f4ba7f75
|
||||||
|
@ -2,6 +2,10 @@
|
|||||||
// Use of this source code is governed by a BSD-style license that can be
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
// found in the LICENSE file.
|
// 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:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
name: metrics_center
|
name: metrics_center
|
||||||
|
|
||||||
|
environment:
|
||||||
|
sdk: '>=2.10.0 <3.0.0'
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
args: 1.6.0
|
args: 1.6.0
|
||||||
crypto: 2.1.5
|
crypto: 2.1.5
|
||||||
|
@ -491,6 +491,8 @@ class SampleChecker {
|
|||||||
final File analysisOptions = File(path.join(directory.path, 'analysis_options.yaml'))..createSync(recursive: true);
|
final File analysisOptions = File(path.join(directory.path, 'analysis_options.yaml'))..createSync(recursive: true);
|
||||||
pubSpec.writeAsStringSync('''
|
pubSpec.writeAsStringSync('''
|
||||||
name: analyze_sample_code
|
name: analyze_sample_code
|
||||||
|
environment:
|
||||||
|
sdk: '>=2.10.0 <3.0.0'
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
@ -56,6 +56,8 @@ Future<void> main(List<String> arguments) async {
|
|||||||
buf.writeln('homepage: https://flutter.dev');
|
buf.writeln('homepage: https://flutter.dev');
|
||||||
// TODO(dnfield): Re-factor for proper versioning, https://github.com/flutter/flutter/issues/55409
|
// TODO(dnfield): Re-factor for proper versioning, https://github.com/flutter/flutter/issues/55409
|
||||||
buf.writeln('version: 0.0.0');
|
buf.writeln('version: 0.0.0');
|
||||||
|
buf.writeln('environment:');
|
||||||
|
buf.writeln(" sdk: '>=2.10.0 <3.0.0'");
|
||||||
buf.writeln('dependencies:');
|
buf.writeln('dependencies:');
|
||||||
for (final String package in findPackageNames()) {
|
for (final String package in findPackageNames()) {
|
||||||
buf.writeln(' $package:');
|
buf.writeln(' $package:');
|
||||||
|
@ -1259,6 +1259,8 @@ String _generateFakePubspec(Iterable<PubspecDependency> dependencies) {
|
|||||||
final StringBuffer result = StringBuffer();
|
final StringBuffer result = StringBuffer();
|
||||||
final StringBuffer overrides = StringBuffer();
|
final StringBuffer overrides = StringBuffer();
|
||||||
result.writeln('name: flutter_update_packages');
|
result.writeln('name: flutter_update_packages');
|
||||||
|
result.writeln('environment:');
|
||||||
|
result.writeln(" sdk: '>=2.10.0 <3.0.0'");
|
||||||
result.writeln('dependencies:');
|
result.writeln('dependencies:');
|
||||||
overrides.writeln('dependency_overrides:');
|
overrides.writeln('dependency_overrides:');
|
||||||
if (_kManuallyPinnedDependencies.isNotEmpty) {
|
if (_kManuallyPinnedDependencies.isNotEmpty) {
|
||||||
|
@ -4,20 +4,20 @@
|
|||||||
|
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:file/memory.dart';
|
||||||
import 'package:flutter_tools/src/artifacts.dart';
|
import 'package:flutter_tools/src/artifacts.dart';
|
||||||
import 'package:flutter_tools/src/base/common.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/file_system.dart';
|
||||||
import 'package:flutter_tools/src/base/io.dart';
|
import 'package:flutter_tools/src/base/io.dart';
|
||||||
import 'package:flutter_tools/src/base/logger.dart';
|
import 'package:flutter_tools/src/base/logger.dart';
|
||||||
import 'package:flutter_tools/src/base/platform.dart';
|
import 'package:flutter_tools/src/base/platform.dart';
|
||||||
import 'package:flutter_tools/src/base/terminal.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/commands/analyze.dart';
|
||||||
import 'package:flutter_tools/src/dart/analysis.dart';
|
import 'package:flutter_tools/src/dart/analysis.dart';
|
||||||
import 'package:flutter_tools/src/dart/pub.dart';
|
import 'package:flutter_tools/src/dart/pub.dart';
|
||||||
import 'package:flutter_tools/src/globals.dart' as globals;
|
import 'package:flutter_tools/src/globals.dart' as globals;
|
||||||
|
import 'package:mockito/mockito.dart';
|
||||||
import 'package:process/process.dart';
|
import 'package:process/process.dart';
|
||||||
|
|
||||||
import '../../src/common.dart';
|
import '../../src/common.dart';
|
||||||
@ -55,6 +55,8 @@ void main() {
|
|||||||
final File pubspecFile = fileSystem.file(fileSystem.path.join(directory.path, 'pubspec.yaml'));
|
final File pubspecFile = fileSystem.file(fileSystem.path.join(directory.path, 'pubspec.yaml'));
|
||||||
pubspecFile.writeAsStringSync('''
|
pubspecFile.writeAsStringSync('''
|
||||||
name: foo_project
|
name: foo_project
|
||||||
|
environment:
|
||||||
|
sdk: '>=2.10.0 <3.0.0'
|
||||||
''');
|
''');
|
||||||
|
|
||||||
final File dartFile = fileSystem.file(fileSystem.path.join(directory.path, 'lib', 'main.dart'));
|
final File dartFile = fileSystem.file(fileSystem.path.join(directory.path, 'lib', 'main.dart'));
|
||||||
|
@ -8,6 +8,8 @@ class SteppingProject extends Project {
|
|||||||
@override
|
@override
|
||||||
final String pubspec = '''
|
final String pubspec = '''
|
||||||
name: test
|
name: test
|
||||||
|
environment:
|
||||||
|
sdk: '>=2.10.0 <3.0.0'
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
@ -62,6 +64,8 @@ class WebSteppingProject extends Project {
|
|||||||
@override
|
@override
|
||||||
final String pubspec = '''
|
final String pubspec = '''
|
||||||
name: test
|
name: test
|
||||||
|
environment:
|
||||||
|
sdk: '>=2.10.0 <3.0.0'
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
Loading…
x
Reference in New Issue
Block a user