Merge remote-tracking branch 'upstream/master' into tap_drag_gestures

Author: Renzo Olivares

.ci.yaml

@@ -29,6 +29,17 @@ platform_properties:
       os: Ubuntu
       cores: "8"
       device_type: none
+  linux_build_test:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:33v6"},
+          {"dependency": "open_jdk", "version": "version:11"},
+          {"dependency": "curl", "version": "version:7.64.0"}
+        ]
+      os: Ubuntu
+      cores: "8"
+      device_type: none
   linux_android:
     properties:
       dependencies: >-
@@ -1922,14 +1933,16 @@ targets:
         ["devicelab", "android", "linux"]
       task_name: new_gallery__transition_perf
 
-  - name: Linux_android flutter_gallery__transition_perf
-    recipe: devicelab/devicelab_drone
+  - name: Linux_build_test flutter_gallery__transition_perf
+    recipe: devicelab/devicelab_drone_build_test
+    bringup: true # New target https://github.com/flutter/flutter/issues/103542
     presubmit: false
     timeout: 60
     properties:
       tags: >
         ["devicelab", "android", "linux"]
       task_name: flutter_gallery__transition_perf
+      artifact: gallery_app_profile
 
   - name: Linux_android flutter_gallery__transition_perf_e2e
     recipe: devicelab/devicelab_drone
@@ -2417,7 +2430,8 @@ targets:
     properties:
       dependencies: >-
         [
-          {"dependency": "xcode", "version": "13f17a"}
+          {"dependency": "xcode", "version": "13f17a"},
+          {"dependency": "gems", "version": "v3.3.14"}
         ]
       tags: >
         ["devicelab", "hostonly"]
@@ -2466,6 +2480,7 @@ targets:
       - .ci.yaml
 
   - name: Mac flutter_gallery_macos__compile
+    bringup: true # New target https://github.com/flutter/flutter/issues/109633
     recipe: devicelab/devicelab_drone
     timeout: 60
     properties:

.gitignore

@@ -107,6 +107,10 @@ unlinked_spec.ds
 **/macos/Flutter/ephemeral
 **/xcuserdata/
 
+# Windows
+**/windows/flutter/generated_plugin_registrant.cc
+**/windows/flutter/generated_plugin_registrant.h
+
 # Coverage
 coverage/
 

bin/internal/engine.version

@@ -1 +1 @@
-ac1eb78a63c72bc6c77748a730c482ff5df55499
+9f306a6ca740ea8f9538587c74d3e39d6e3fd684

bin/internal/flutter_plugins.version

@@ -1 +1 @@
-20bb8653be9ed5e95c6a559e4a466dcded409500
+c08e447f989c154c9f111298014e090da6cc4c41

bin/internal/fuchsia-linux.version

@@ -1 +1 @@
-YA1UNiP5OSCiW_xtPZqMKQAxrV7bzQY0jdylqfrKkYYC
+NwG1XTWHxB9R3XcU5RnI7-xe864ILf4QRkQAWYNeFy4C

bin/internal/fuchsia-mac.version

@@ -1 +1 @@
-tkgkEsRLKXHmBfwZ5Cah6yQvqr5z0qzLiNJV9oRp2FkC
+4GZkuoQmvVanO84uAX2O1xjoD2W4NUVRi1aGpqkhXkQC

dev/benchmarks/complex_layout/lib/src/app.dart

@@ -90,7 +90,26 @@ class ComplexLayout extends StatefulWidget {
 class ComplexLayoutState extends State<ComplexLayout> {
   @override
   Widget build(BuildContext context) {
-    print(widget.badScroll);
+    Widget body = ListView.builder(
+      key: const Key('complex-scroll'), // this key is used by the driver test
+      controller: ScrollController(),  // So that the scroll offset can be tracked
+      itemCount: widget.badScroll ? 500 : null,
+      shrinkWrap: widget.badScroll,
+      itemBuilder: (BuildContext context, int index) {
+        if (index.isEven) {
+          return FancyImageItem(index, key: PageStorageKey<int>(index));
+        } else {
+          return FancyGalleryItem(index, key: PageStorageKey<int>(index));
+        }
+      },
+    );
+    if (widget.badScroll) {
+      body = ListView(
+        key: const Key('complex-scroll-bad'),
+        children: <Widget>[body],
+      );
+    }
+
     return Scaffold(
       appBar: AppBar(
         title: const Text('Advanced Layout'),
@@ -107,21 +126,7 @@ class ComplexLayoutState extends State<ComplexLayout> {
       ),
       body: Column(
         children: <Widget>[
-          Expanded(
-            child: ListView.builder(
-              key: const Key('complex-scroll'), // this key is used by the driver test
-              controller: ScrollController(),  // So that the scroll offset can be tracked
-              itemCount: widget.badScroll ? 500 : null,
-              shrinkWrap: widget.badScroll,
-              itemBuilder: (BuildContext context, int index) {
-                if (index.isEven) {
-                  return FancyImageItem(index, key: PageStorageKey<int>(index));
-                } else {
-                  return FancyGalleryItem(index, key: PageStorageKey<int>(index));
-                }
-              },
-            ),
-          ),
+          Expanded(child: body),
           const BottomBar(),
         ],
       ),

dev/benchmarks/complex_layout/test_driver/scroll_perf_bad_test.dart

@@ -53,7 +53,7 @@ void main() {
     }
 
     test('complex_layout_scroll_perf', () async {
-      await testScrollPerf('complex-scroll', 'complex_layout_scroll_perf');
+      await testScrollPerf('complex-scroll-bad', 'complex_layout_scroll_perf');
     }, timeout: Timeout.none);
   });
 }

dev/ci/docker_linux/Dockerfile

@@ -12,7 +12,7 @@
 
 # Last manual update 2021-09-24 (changing this comment will re-build image)
 
-FROM debian@sha256:68c1f6bae105595d2ebec1589d9d476ba2939fdb11eaba1daec4ea826635ce75
+FROM ubuntu:bionic@sha256:e4771b7160543c6e43968b4e9795be9ddcad9d573edd7cd7aebd3ce61326fc7a
 MAINTAINER Flutter Developers <[email protected]>
 
 RUN apt-get update -y && \

dev/conductor/core/lib/src/start.dart

@@ -134,13 +134,13 @@ class StartCommand extends Command<void> {
       platform.environment,
     )!;
     final String frameworkMirror =
-        'https://github.com/$githubUsername/flutter.git';
+        'git@github.com:$githubUsername/flutter.git';
     final String engineUpstream = getValueFromEnvOrArgs(
       kEngineUpstreamOption,
       argumentResults,
       platform.environment,
     )!;
-    final String engineMirror = 'https://github.com/$githubUsername/engine.git';
+    final String engineMirror = 'git@github.com:$githubUsername/engine.git';
     final String candidateBranch = getValueFromEnvOrArgs(
       kCandidateOption,
       argumentResults,