Merge branch 'flutter:main' into feature/video-player/add-optional-we…

…b-options
flutter · Jul 8, 2023 · 344ecd1 · 344ecd1
2 parents e4655dc + 3eaad3d
commit 344ecd1
Show file tree

Hide file tree

Showing 51 changed files with 713 additions and 254 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -97,7 +97,6 @@ targets:
       version_file: flutter_master.version
 
   - name: Linux repo_checks
-    bringup: true # New target
     recipe: packages/packages
     timeout: 30
     properties:
@@ -246,11 +245,9 @@ targets:
       channel: master
 
   - name: Linux_android custom_package_tests stable
-    bringup: true # Blocked on https://github.com/flutter/flutter/issues/130071
     recipe: packages/packages
     timeout: 30
     properties:
-      add_recipes_cq: "true"
       version_file: flutter_stable.version
       target_file: linux_custom_package_tests.yaml
       cores: "32"
@@ -282,7 +279,6 @@ targets:
       channel: stable
 
   - name: Linux_android android_platform_tests_shard_1 master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
@@ -293,7 +289,6 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_2 master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
@@ -304,7 +299,6 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_3 master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
@@ -315,7 +309,6 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_4 master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
@@ -326,7 +319,6 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_5 master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
@@ -337,18 +329,16 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_6 master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
       cores: "32"
-      package_sharding: "--shardIndex 6 --shardCount 6"
+      package_sharding: "--shardIndex 5 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_1 stable
-    bringup: true # New target
     recipe: packages/packages
     presubmit: false
     timeout: 60
@@ -360,7 +350,6 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_2 stable
-    bringup: true # New target
     recipe: packages/packages
     presubmit: false
     timeout: 60
@@ -372,7 +361,6 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_3 stable
-    bringup: true # New target
     recipe: packages/packages
     presubmit: false
     timeout: 60
@@ -384,7 +372,6 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_4 stable
-    bringup: true # New target
     recipe: packages/packages
     presubmit: false
     timeout: 60
@@ -396,7 +383,6 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_5 stable
-    bringup: true # New target
     recipe: packages/packages
     presubmit: false
     timeout: 60
@@ -408,7 +394,6 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 6"
 
   - name: Linux_android android_platform_tests_shard_6 stable
-    bringup: true # New target
     recipe: packages/packages
     presubmit: false
     timeout: 60
@@ -417,7 +402,7 @@ targets:
       channel: stable
       version_file: flutter_stable.version
       cores: "32"
-      package_sharding: "--shardIndex 6 --shardCount 6"
+      package_sharding: "--shardIndex 5 --shardCount 6"
 
   ### Web tasks ###
   - name: Linux_web web_build_all_packages master
@@ -438,7 +423,6 @@ targets:
       channel: stable
 
   - name: Linux_web web_platform_tests_shard_1 master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
@@ -449,7 +433,6 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 2"
 
   - name: Linux_web web_platform_tests_shard_2 master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
@@ -460,7 +443,6 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 2"
 
   - name: Linux_web web_platform_tests_shard_1 stable
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:
@@ -471,7 +453,6 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 2"
 
   - name: Linux_web web_platform_tests_shard_2 stable
-    bringup: true # New target
     recipe: packages/packages
     timeout: 60
     properties:

diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-bc49cd1bcab51c491789e36dbbc4b53ca4d49dc6
+d55a7d89e05ede19676ef8065e4c72123107b6dd
diff --git a/.ci/targets/android_platform_tests.yaml b/.ci/targets/android_platform_tests.yaml
@@ -11,9 +11,11 @@ tasks:
   # different exclusions.
   # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
   # these steps.
-  - name: native unit tests
-    script: script/tool_runner.sh
-    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
+  # TODO(stuartmorgan): Enable this once https://github.com/flutter/flutter/issues/130148
+  # is resolved.
+  #- name: native unit tests
+  #  script: script/tool_runner.sh
+  #  args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
   # TODO(stuartmorgan): Enable these once
   # https://github.com/flutter/flutter/issues/120736 is implemented.
   # See also https://github.com/flutter/flutter/issues/114373

diff --git a/.cirrus.yml b/.cirrus.yml
@@ -65,20 +65,6 @@ task:
     # (on Flutter master).
     - name: repo_checks
       always:
-        format_script: ./script/tool_runner.sh format --fail-on-change
-        license_script: $PLUGIN_TOOL_COMMAND license-check
-        # The major and minor version here should match the lowest version
-        # analyzed in legacy_version_analyze.
-        pubspec_script: ./script/tool_runner.sh pubspec-check --min-min-flutter-version=3.3.0 --allow-dependencies=script/configs/allowed_unpinned_deps.yaml --allow-pinned-dependencies=script/configs/allowed_pinned_deps.yaml
-        readme_script:
-          - ./script/tool_runner.sh readme-check
-          # Re-run with --require-excerpts, skipping packages that still need
-          # to be converted. Once https://github.com/flutter/flutter/issues/102679
-          # has been fixed, this can be removed and there can just be a single
-          # run with --require-excerpts and no exclusions.
-          - ./script/tool_runner.sh readme-check --require-excerpts --exclude=script/configs/temp_exclude_excerpt.yaml
-        dependabot_script: $PLUGIN_TOOL_COMMAND dependabot-check
-        gradle_script: $PLUGIN_TOOL_COMMAND gradle-check
         version_script:
           # For pre-submit, pass the PR labels to the script to allow for
           # check overrides.
@@ -90,7 +76,6 @@ task:
           - else
           -   ./script/tool_runner.sh version-check --check-for-missing-changes --pr-labels="$CIRRUS_PR_LABELS"
           - fi
-        publishable_script: ./script/tool_runner.sh publish-check --allow-pre-release
         federated_safety_script:
           # This check is only meaningful for PRs, as it validates changes
           # rather than state.
@@ -157,43 +142,26 @@ task:
     cpu: 4
     memory: 16G
   matrix:
-    ### Platform-agnostic tasks ###
-    - name: linux-custom_package_tests
-      env:
-        PATH: $PATH:/usr/local/bin
-        # Master has been migrated to LUCI, but stable is blocked on
-        # https://github.com/flutter/flutter/issues/130071
-        CHANNEL: "stable"
-      << : *INSTALL_CHROME_LINUX
-      local_tests_script:
-        - ./script/tool_runner.sh custom-test
     ### Android tasks ###
     - name: android-platform_tests
       # Don't run full platform tests on both channels in pre-submit.
       skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
       env:
         matrix:
-          PACKAGE_SHARDING: "--shardIndex 0 --shardCount 8"
-          PACKAGE_SHARDING: "--shardIndex 1 --shardCount 8"
-          PACKAGE_SHARDING: "--shardIndex 2 --shardCount 8"
-          PACKAGE_SHARDING: "--shardIndex 3 --shardCount 8"
-          PACKAGE_SHARDING: "--shardIndex 4 --shardCount 8"
-          PACKAGE_SHARDING: "--shardIndex 5 --shardCount 8"
-          PACKAGE_SHARDING: "--shardIndex 6 --shardCount 8"
-          PACKAGE_SHARDING: "--shardIndex 7 --shardCount 8"
+          PACKAGE_SHARDING: "--shardIndex 0 --shardCount 6"
+          PACKAGE_SHARDING: "--shardIndex 1 --shardCount 6"
+          PACKAGE_SHARDING: "--shardIndex 2 --shardCount 6"
+          PACKAGE_SHARDING: "--shardIndex 3 --shardCount 6"
+          PACKAGE_SHARDING: "--shardIndex 4 --shardCount 6"
+          PACKAGE_SHARDING: "--shardIndex 5 --shardCount 6"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[d6583b08f79f91ea4844c77460f04539965e46ad2fd97fb7c062b4dfe88016228b86ebe8c220ab4187e0c4bd773dc1e7]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[1a2eebf9367197bbe812d9a0ea83a53a05aeba4bb5e4964fe6a69727883cd87e51238d39237b1f80b0894c48419ac268]
-      build_script:
-        - ./script/tool_runner.sh build-examples --apk
-      lint_script:
-        - ./script/tool_runner.sh lint-android # must come after build-examples
       native_unit_test_script:
         # Native integration tests are handled by Firebase Test Lab below, so
         # only run unit tests.
-        # Must come after build-examples.
         - ./script/tool_runner.sh native-test --android --no-integration --exclude script/configs/exclude_native_unit_android.yaml
       firebase_test_lab_script:
         - if [[ -n "$GCLOUD_FIREBASE_TESTLAB_KEY" ]]; then
@@ -202,28 +170,7 @@ task:
         - else
         -   echo "This user does not have permission to run Firebase Test Lab tests."
         - fi
-      # Upload the full lint results to Cirrus to display in the results UI.
-      always:
-        android-lint_artifacts:
-          path: "**/reports/lint-results-debug.xml"
-          type: text/xml
-          format: android-lint
     ### Web tasks ###
-    - name: web-platform_tests
-      env:
-        matrix:
-          PACKAGE_SHARDING: "--shardIndex 0 --shardCount 2"
-          PACKAGE_SHARDING: "--shardIndex 1 --shardCount 2"
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
-      << : *INSTALL_CHROME_LINUX
-      chromedriver_background_script:
-        - $CHROMEDRIVER_EXECUTABLE --port=4444
-      build_script:
-        - ./script/tool_runner.sh build-examples --web
-      drive_script:
-        - ./script/tool_runner.sh drive-examples --web --exclude=script/configs/exclude_integration_web.yaml
     - name: web_benchmarks_test
       env:
         matrix:

diff --git a/.github/autosubmit.yml b/.github/autosubmit.yml
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v1.0.26
+        uses: github/codeql-action/upload-sarif@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v1.0.26
         with:
           sarif_file: results.sarif
diff --git a/packages/file_selector/file_selector_android/CHANGELOG.md b/packages/file_selector/file_selector_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.0+1
+
+* Bumps androidx.annotation:annotation from 1.5.0 to 1.6.0.
+* Adds a dependency on kotlin-bom to align versions of Kotlin transitive dependencies.
+
 ## 0.5.0
 
 * Implements file_selector_platform_interface for Android.
diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle
@@ -38,10 +38,14 @@ android {
     }
 
     dependencies {
-        implementation 'androidx.annotation:annotation:1.5.0'
+        implementation 'androidx.annotation:annotation:1.6.0'
         testImplementation 'junit:junit:4.13.2'
         testImplementation 'org.mockito:mockito-inline:5.1.0'
         testImplementation 'androidx.test:core:1.3.0'
+
+        // org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
+        // See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
+        implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
     }
 
     lintOptions {

diff --git a/packages/file_selector/file_selector_android/pubspec.yaml b/packages/file_selector/file_selector_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: file_selector_android
 description: Android implementation of the file_selector package.
 repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
-version: 0.5.0
+version: 0.5.0+1
 
 environment:
   sdk: ">=2.18.0 <4.0.0"

diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.17
+
+* Introduces a new `MarkdownElementBuilder.visitElementAfterWithContext()` method passing the widget `BuildContext` and
+  the parent text's `TextStyle`.
+
 ## 0.6.16
 
 * Adds `tableVerticalAlignment` property to allow aligning table cells vertically.

diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart
@@ -74,6 +74,13 @@ class _InlineElement {
 
 /// A delegate used by [MarkdownBuilder] to control the widgets it creates.
 abstract class MarkdownBuilderDelegate {
+  /// Returns the [BuildContext] of the [MarkdownWidget].
+  ///
+  /// The context will be passed down to the
+  /// [MarkdownElementBuilder.visitElementBefore] method and allows elements to
+  /// get information from the context.
+  BuildContext get context;
+
   /// Returns a gesture recognizer to use for an `a` element with the given
   /// text, `href` attribute, and title.
   GestureRecognizer createLink(String text, String? href, String title);
@@ -454,8 +461,12 @@ class MarkdownBuilder implements md.NodeVisitor {
       }
 
       if (builders.containsKey(tag)) {
-        final Widget? child =
-            builders[tag]!.visitElementAfter(element, styleSheet.styles[tag]);
+        final Widget? child = builders[tag]!.visitElementAfterWithContext(
+          delegate.context,
+          element,
+          styleSheet.styles[tag],
+          parent.style,
+        );
         if (child != null) {
           if (current.children.isEmpty) {
             current.children.add(child);