Flutter 2.10.2 (dart-lang#829)

johnpryan · Feb 22, 2022 · f536d30 · f536d30
1 parent 061e9b4
commit f536d30
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 42 deletions.
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -147,7 +147,7 @@ packages:
       name: codemirror
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.7+5.63.3"
+    version: "0.7.1+5.65.1"
   collection:
     dependency: transitive
     description:

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -6,7 +6,7 @@ environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  codemirror: ^0.6.2+5.61.1
+  codemirror: ^0.7.1+5.65.1
   http: ^0.13.0
 
 dev_dependencies:

diff --git a/example/web/index.dart b/example/web/index.dart
@@ -45,7 +45,7 @@ void setupAnalyze() {
   final output = querySelector('#analyzeSection-v2 .output')!;
   final button = querySelector('#analyzeSection-v2 button') as ButtonElement;
   button.onClick.listen((e) {
-    final source = {'source': editor.getDoc()!.getValue()};
+    final source = {'source': editor.doc.getValue()};
     final sw = Stopwatch()..start();
     post(
       '$_uriBase/dartservices/v2/analyze',
@@ -78,7 +78,7 @@ void setupCompile() {
   final output = querySelector('#compileSection-v2 .output')!;
   final button = querySelector('#compileSection-v2 button') as ButtonElement;
   button.onClick.listen((e) {
-    final source = editor.getDoc()!.getValue();
+    final source = editor.doc.getValue();
     final compile = {'source': source};
     final sw = Stopwatch()..start();
     post(
@@ -93,7 +93,7 @@ void setupCompileDDC() {
   final output = querySelector('#compileDDCSection-v2 .output')!;
   final button = querySelector('#compileDDCSection-v2 button') as ButtonElement;
   button.onClick.listen((e) {
-    final source = editor.getDoc()!.getValue();
+    final source = editor.doc.getValue();
     final compile = {'source': source};
     final sw = Stopwatch()..start();
     post(
@@ -193,12 +193,12 @@ String? get _uriBase =>
     (querySelector('input[type=text]') as InputElement).value;
 
 int? _getOffset(CodeMirror editor) {
-  final pos = editor.getDoc()!.getCursor();
-  return editor.getDoc()!.indexFromPos(pos);
+  final pos = editor.doc.getCursor();
+  return editor.doc.indexFromPos(pos);
 }
 
 Map<String, dynamic> _getSourceRequest(CodeMirror editor) => {
-      'source': editor.getDoc()!.getValue(),
+      'source': editor.doc.getValue(),
       'offset': _getOffset(editor),
     };
 

diff --git a/flutter-sdk-version.yaml b/flutter-sdk-version.yaml
@@ -7,13 +7,13 @@
 
 flutter_sdk:
   stable:
-    flutter_version: 2.10.1
+    flutter_version: 2.10.2
     dart_language_version: 2.16.1
   beta:
     flutter_version: 2.11.0-0.1.pre
     dart_language_version: 2.17.0-0
   dev:
-    flutter_version: 2.10.1
+    flutter_version: 2.10.2
     dart_language_version: 2.16.1
   old:
     flutter_version: 2.8.1

diff --git a/lib/src/sdk.dart b/lib/src/sdk.dart
@@ -174,9 +174,9 @@ class _DownloadedFlutterSdk {
 
   Future<int> init() =>
       // `flutter --version` takes ~28s.
-      _execLog('bin/flutter', ['--version'], flutterSdkPath);
+      _execLog(path.join('bin', 'flutter'), ['--version'], flutterSdkPath);
 
-  String get sdkPath => path.join(flutterSdkPath, 'bin/cache/dart-sdk');
+  String get sdkPath => path.join(flutterSdkPath, 'bin', 'cache', 'dart-sdk');
 
   String get versionFull =>
       File(path.join(sdkPath, 'version')).readAsStringSync().trim();

diff --git a/pubspec.lock b/pubspec.lock
@@ -7,28 +7,28 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "31.0.0"
+    version: "34.0.0"
   analysis_server_lib:
     dependency: "direct main"
     description:
       name: analysis_server_lib
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.2"
   analyzer:
     dependency: "direct main"
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.0"
+    version: "3.2.0"
   angel3_mock_request:
     dependency: "direct dev"
     description:
       name: angel3_mock_request
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   args:
     dependency: "direct main"
     description:
@@ -63,7 +63,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.2.1"
   build_config:
     dependency: transitive
     description:
@@ -84,21 +84,21 @@ packages:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.7"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.2.2"
+    version: "7.2.3"
   built_collection:
     dependency: transitive
     description:
@@ -112,7 +112,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.1.3"
+    version: "8.1.4"
   charcode:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: coverage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.1.0"
   crypto:
     dependency: "direct main"
     description:
@@ -175,7 +175,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   file:
     dependency: transitive
     description:
@@ -238,7 +238,7 @@ packages:
       name: http_multi_server
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.2.0"
   http_parser:
     dependency: transitive
     description:
@@ -259,7 +259,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   json_annotation:
     dependency: transitive
     description:
@@ -322,7 +322,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   pedantic:
     dependency: "direct dev"
     description:
@@ -399,7 +399,7 @@ packages:
       name: shelf_router_generator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   shelf_static:
     dependency: transitive
     description:
@@ -420,7 +420,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -441,7 +441,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -490,21 +490,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.19.5"
+    version: "1.20.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.8"
+    version: "0.4.9"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.11"
   test_descriptor:
     dependency: "direct dev"
     description:
@@ -532,7 +532,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.5.0"
+    version: "8.1.0"
   watcher:
     dependency: transitive
     description:
@@ -562,4 +562,4 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
+  dart: ">=2.16.0-100.0.dev <3.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -6,7 +6,7 @@ environment:
 
 dependencies:
   analysis_server_lib: ^0.2.0
-  analyzer: ^2.5.0
+  analyzer: ^3.2.0
   args: ^2.0.0
   bazel_worker: ^1.0.0
   crypto: ^3.0.1

diff --git a/tool/grind.dart b/tool/grind.dart
@@ -43,7 +43,7 @@ void analyzeTest() {}
 @Depends(buildStorageArtifacts)
 Future<void> serve() async {
   await _run(Platform.executable, arguments: [
-    'bin/server_dev.dart',
+    path.join('bin', 'server_dev.dart'),
     '--channel',
     _channel,
     '--port',
@@ -55,7 +55,7 @@ Future<void> serve() async {
 @Depends(buildStorageArtifacts)
 Future<void> serveNullSafety() async {
   await _run(Platform.executable, arguments: [
-    'bin/server_dev.dart',
+    path.join('bin', 'server_dev.dart'),
     '--channel',
     _channel,
     '--port',

diff --git a/tool/pub_dependencies_beta.json b/tool/pub_dependencies_beta.json
@@ -65,6 +65,6 @@
   "url_launcher_web": "2.0.8",
   "url_launcher_windows": "3.0.0",
   "vector_math": "2.1.1",
-  "win32": "2.4.0",
+  "win32": "2.4.1",
   "xdg_directories": "0.2.0+1"
 }
diff --git a/tool/pub_dependencies_dev.json b/tool/pub_dependencies_dev.json
@@ -1,5 +1,5 @@
 {
-  "archive": "3.2.0",
+  "archive": "3.2.1",
   "async": "2.8.2",
   "bloc": "8.0.2",
   "boolean_selector": "2.1.0",
@@ -92,7 +92,7 @@
   "url_launcher_web": "2.0.8",
   "url_launcher_windows": "3.0.0",
   "vector_math": "2.1.1",
-  "win32": "2.4.0",
+  "win32": "2.4.1",
   "xdg_directories": "0.2.0+1",
   "xml": "5.3.1"
 }
diff --git a/tool/pub_dependencies_old.json b/tool/pub_dependencies_old.json
@@ -64,6 +64,6 @@
   "url_launcher_web": "2.0.6",
   "url_launcher_windows": "3.0.0",
   "vector_math": "2.1.1",
-  "win32": "2.4.0",
+  "win32": "2.4.1",
   "xdg_directories": "0.2.0+1"
 }
diff --git a/tool/pub_dependencies_stable.json b/tool/pub_dependencies_stable.json
@@ -65,6 +65,6 @@
   "url_launcher_web": "2.0.8",
   "url_launcher_windows": "3.0.0",
   "vector_math": "2.1.1",
-  "win32": "2.4.0",
+  "win32": "2.4.1",
   "xdg_directories": "0.2.0+1"
 }