Merge branch 'master' into integration_test/revert_flutter_image

flutter · Apr 15, 2024 · f3db998 · f3db998
2 parents 290d0b9 + 63634c2
commit f3db998
Show file tree

Hide file tree

Showing 363 changed files with 7,299 additions and 4,168 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -1730,7 +1730,6 @@ targets:
       - .ci.yaml
 
   - name: Linux web_skwasm_tests_0
-    bringup: true
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
@@ -1753,7 +1752,6 @@ targets:
       - .ci.yaml
 
   - name: Linux web_skwasm_tests_1
-    bringup: true
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
@@ -1776,7 +1774,6 @@ targets:
       - .ci.yaml
 
   - name: Linux web_skwasm_tests_2
-    bringup: true
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
@@ -1799,7 +1796,6 @@ targets:
       - .ci.yaml
 
   - name: Linux web_skwasm_tests_3
-    bringup: true
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
@@ -1822,7 +1818,6 @@ targets:
       - .ci.yaml
 
   - name: Linux web_skwasm_tests_4
-    bringup: true
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
@@ -1845,7 +1840,6 @@ targets:
       - .ci.yaml
 
   - name: Linux web_skwasm_tests_5
-    bringup: true
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
@@ -1868,7 +1862,6 @@ targets:
       - .ci.yaml
 
   - name: Linux web_skwasm_tests_6
-    bringup: true
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
@@ -1891,7 +1884,6 @@ targets:
       - .ci.yaml
 
   - name: Linux web_skwasm_tests_7_last
-    bringup: true
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
@@ -2249,7 +2241,7 @@ targets:
       task_name: complex_layout_scroll_perf_impeller__timeline_summary
       dependencies: >-
         [
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk", "version": "version:17"}
         ]
 
   - name: Linux_pixel_7pro complex_layout_scroll_perf_impeller_gles__timeline_summary
@@ -2262,7 +2254,7 @@ targets:
       task_name: complex_layout_scroll_perf_impeller_gles__timeline_summary
       dependencies: >-
         [
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk", "version": "version:17"}
         ]
 
   # linux motog4 benchmark

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -23,7 +23,7 @@ jobs:
       - name: ./bin/flutter test --coverage
         run: pushd packages/flutter;../../bin/flutter test --coverage -j 1;popd
       - name: upload coverage
-        uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71
+        uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
         with:
           files: packages/flutter/coverage/lcov.info
           verbose: true
diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml
@@ -30,7 +30,7 @@ jobs:
           cd flutter
           touch empty.json
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e
+        uses: peter-evans/create-pull-request@c55203cfde3e5c11a452d352b4393e68b85b4533
         with:
           path: flutter
           commit-message: blah

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -51,6 +51,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2
+        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a
         with:
           sarif_file: results.sarif
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ graphics, video, text, and controls without limitation. Flutter includes a full
 you're building for iOS ([Cupertino]) or other platforms ([Material]), along with
 support for customizing or creating entirely new visual components.
 
-<p align="center"><img src="https://github.com/flutter/website/blob/main/src/assets/images/docs/homepage/reflectly-hero-600px.png?raw=true" alt="Reflectly hero image"></p>
+<p align="center"><img src="https://github.com/flutter/website/blob/main/src/content/assets/images/docs/homepage/reflectly-hero-600px.png?raw=true" alt="Reflectly hero image"></p>
 
 ### Fast results
 
@@ -76,7 +76,7 @@ compilation to 32-bit and 64-bit ARM machine code for iOS and Android,
 JavaScript and WebAssembly for the web, as well as Intel x64 and ARM
 for desktop devices.
 
-<p align="center"><img src="https://github.com/flutter/website/blob/main/src/assets/images/docs/homepage/dart-diagram-small.png?raw=true" alt="Dart diagram"></p>
+<p align="center"><img src="https://github.com/flutter/website/blob/main/src/content/assets/images/docs/homepage/dart-diagram-small.png?raw=true" alt="Dart diagram"></p>
 
 ### Productive development
 

diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-597d33f571834ccd155cc5a1d81f7d66e20a75af
+1a13c7d1f40e32decdacc066a922fc95d6f554cb
diff --git a/bin/internal/flutter_packages.version b/bin/internal/flutter_packages.version
@@ -1 +1 @@
-dce6f0c91fcf01ee3a67e3475155ec9f16ce2a66
+78f684ce67719fec6bb763e2ceb12e62a34a2c3e
diff --git a/bin/internal/fuchsia-linux.version b/bin/internal/fuchsia-linux.version
@@ -1 +1 @@
-TAr6MCirveGvhZFHKSjNeUcG_Sv1KpQAB1dNt-NZIWgC
+peYcbx9eguHcbhMP00N4RjvNWuk5s5GR4TrllCDBAmIC
diff --git a/dev/a11y_assessments/android/buildscript-gradle.lockfile b/dev/a11y_assessments/android/buildscript-gradle.lockfile
@@ -0,0 +1,156 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+androidx.databinding:databinding-common:8.1.0=classpath
+androidx.databinding:databinding-compiler-common:8.1.0=classpath
+com.android.application:com.android.application.gradle.plugin:8.1.0=classpath
+com.android.databinding:baseLibrary:8.1.0=classpath
+com.android.tools.analytics-library:crash:31.1.0=classpath
+com.android.tools.analytics-library:protos:31.1.0=classpath
+com.android.tools.analytics-library:shared:31.1.0=classpath
+com.android.tools.analytics-library:tracker:31.1.0=classpath
+com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath
+com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath
+com.android.tools.build:aaptcompiler:8.1.0=classpath
+com.android.tools.build:apksig:8.1.0=classpath
+com.android.tools.build:apkzlib:8.1.0=classpath
+com.android.tools.build:builder-model:8.1.0=classpath
+com.android.tools.build:builder-test-api:8.1.0=classpath
+com.android.tools.build:builder:8.1.0=classpath
+com.android.tools.build:bundletool:1.14.0=classpath
+com.android.tools.build:gradle-api:8.1.0=classpath
+com.android.tools.build:gradle-settings-api:8.1.0=classpath
+com.android.tools.build:gradle:8.1.0=classpath
+com.android.tools.build:manifest-merger:31.1.0=classpath
+com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
+com.android.tools.ddms:ddmlib:31.1.0=classpath
+com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath
+com.android.tools.lint:lint-model:31.1.0=classpath
+com.android.tools.lint:lint-typedef-remover:31.1.0=classpath
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath
+com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath
+com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath
+com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath
+com.android.tools:annotations:31.1.0=classpath
+com.android.tools:common:31.1.0=classpath
+com.android.tools:dvlib:31.1.0=classpath
+com.android.tools:repository:31.1.0=classpath
+com.android.tools:sdk-common:31.1.0=classpath
+com.android.tools:sdklib:31.1.0=classpath
+com.android:signflinger:8.1.0=classpath
+com.android:zipflinger:8.1.0=classpath
+com.github.gundy:semver4j:0.16.4=classpath
+com.google.android:annotations:4.1.1.4=classpath
+com.google.api.grpc:proto-google-common-protos:2.0.1=classpath
+com.google.auto.value:auto-value-annotations:1.6.2=classpath
+com.google.code.findbugs:jsr305:3.0.2=classpath
+com.google.code.gson:gson:2.8.9=classpath
+com.google.crypto.tink:tink:1.7.0=classpath
+com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.11.0=classpath
+com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
+com.google.guava:failureaccess:1.0.1=classpath
+com.google.guava:guava:31.1-jre=classpath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
+com.google.j2objc:j2objc-annotations:1.3=classpath
+com.google.jimfs:jimfs:1.1=classpath
+com.google.protobuf:protobuf-java-util:3.19.3=classpath
+com.google.protobuf:protobuf-java:3.19.3=classpath
+com.google.testing.platform:core-proto:0.0.8-alpha08=classpath
+com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
+com.squareup:javapoet:1.10.0=classpath
+com.squareup:javawriter:2.5.0=classpath
+com.sun.activation:javax.activation:1.2.0=classpath
+com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+commons-codec:commons-codec:1.11=classpath
+commons-io:commons-io:2.4=classpath
+commons-logging:commons-logging:1.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
+io.grpc:grpc-api:1.45.1=classpath
+io.grpc:grpc-context:1.45.1=classpath
+io.grpc:grpc-core:1.45.1=classpath
+io.grpc:grpc-netty:1.45.1=classpath
+io.grpc:grpc-protobuf-lite:1.45.1=classpath
+io.grpc:grpc-protobuf:1.45.1=classpath
+io.grpc:grpc-stub:1.45.1=classpath
+io.netty:netty-buffer:4.1.72.Final=classpath
+io.netty:netty-codec-http2:4.1.72.Final=classpath
+io.netty:netty-codec-http:4.1.72.Final=classpath
+io.netty:netty-codec-socks:4.1.72.Final=classpath
+io.netty:netty-codec:4.1.72.Final=classpath
+io.netty:netty-common:4.1.72.Final=classpath
+io.netty:netty-handler-proxy:4.1.72.Final=classpath
+io.netty:netty-handler:4.1.72.Final=classpath
+io.netty:netty-resolver:4.1.72.Final=classpath
+io.netty:netty-tcnative-classes:2.0.46.Final=classpath
+io.netty:netty-transport:4.1.72.Final=classpath
+io.perfmark:perfmark-api:0.23.0=classpath
+jakarta.activation:jakarta.activation-api:1.2.1=classpath
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
+javax.annotation:javax.annotation-api:1.3.2=classpath
+javax.inject:javax.inject:1=classpath
+net.java.dev.jna:jna-platform:5.6.0=classpath
+net.java.dev.jna:jna:5.6.0=classpath
+net.sf.jopt-simple:jopt-simple:4.9=classpath
+net.sf.kxml:kxml2:2.3.0=classpath
+org.apache.commons:commons-compress:1.21=classpath
+org.apache.httpcomponents:httpclient:4.5.13=classpath
+org.apache.httpcomponents:httpcore:4.4.15=classpath
+org.apache.httpcomponents:httpmime:4.5.6=classpath
+org.bitbucket.b_c:jose4j:0.7.0=classpath
+org.bouncycastle:bcpkix-jdk15on:1.67=classpath
+org.bouncycastle:bcprov-jdk15on:1.67=classpath
+org.checkerframework:checker-qual:3.12.0=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.2=classpath
+org.jdom:jdom2:2.0.6=classpath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
+org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains:annotations:13.0=classpath
+org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.ow2.asm:asm-analysis:9.2=classpath
+org.ow2.asm:asm-commons:9.2=classpath
+org.ow2.asm:asm-tree:9.2=classpath
+org.ow2.asm:asm-util:9.2=classpath
+org.ow2.asm:asm:9.2=classpath
+org.slf4j:slf4j-api:1.7.30=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+xerces:xercesImpl:2.12.0=classpath
+xml-apis:xml-apis:1.4.01=classpath
+empty=
diff --git a/dev/a11y_assessments/android/gradle/wrapper/gradle-wrapper.properties b/dev/a11y_assessments/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/dev/a11y_assessments/android/settings.gradle b/dev/a11y_assessments/android/settings.gradle
@@ -25,9 +25,16 @@ pluginManagement {
     }
 }
 
+buildscript {
+    dependencyLocking {
+        lockFile = file("${rootProject.projectDir}/buildscript-gradle.lockfile")
+        lockAllConfigurations()
+    }
+}
+
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.1.0" apply false
     id "org.jetbrains.kotlin.android" version "1.7.10" apply false
 }
 

diff --git a/dev/a11y_assessments/windows/runner/runner.exe.manifest b/dev/a11y_assessments/windows/runner/runner.exe.manifest
@@ -9,12 +9,6 @@
     <application>
       <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-      <!-- Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-      <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
     </application>
   </compatibility>
 </assembly>
diff --git a/dev/automated_tests/pubspec.yaml b/dev/automated_tests/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
 
   _fe_analyzer_shared: 67.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   analyzer: 6.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  args: 2.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  args: 2.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -66,7 +66,7 @@ dependencies:
   vm_service: 14.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   web: 0.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  web_socket_channel: 2.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  web_socket_channel: 2.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
@@ -75,4 +75,4 @@ flutter:
   assets:
     - icon/test.png
 
-# PUBSPEC CHECKSUM: 8913
+# PUBSPEC CHECKSUM: 7413