Skip to content

Commit

Permalink
Merge branch 'flutter:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
sm-FN authored May 3, 2022
2 parents 838fc09 + bce32f6 commit c209461
Show file tree
Hide file tree
Showing 737 changed files with 34,084 additions and 4,448 deletions.
21 changes: 0 additions & 21 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ enabled_branches:
platform_properties:
linux:
properties:
caches: >-
[
]
dependencies: >
[
{"dependency": "curl"}
Expand All @@ -22,11 +19,6 @@ platform_properties:
os: Linux
windows:
properties:
caches: >-
[
{"name": "vsbuild", "path": "vsbuild"},
{"name": "pub_cache", "path": ".pub-cache"}
]
dependencies: >
[
{"dependency": "certs"}
Expand Down Expand Up @@ -85,19 +77,6 @@ targets:
{"dependency": "vs_build"}
]
- name: Windows uwp-platform_tests master
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: uwp_build_and_platform_tests.yaml
channel: master
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build"}
]
- name: Windows plugin_tools_tests
recipe: plugins/plugins
timeout: 30
Expand Down
2 changes: 1 addition & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The Flutter version is not important here, since the CI scripts update Flutter
# before running. What matters is that the base image is pinned to minimize
# unintended changes when modifying this file.
FROM cirrusci/flutter:2.8.0
FROM cirrusci/flutter@sha256:505fe8bce2896c75b4df9ccf500b1604155bf932af7465ffcc66fcae8612f82f

RUN apt-get update -y

Expand Down
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
509ddfda5c1bda7c01cf51fe24607da19423d5f9
7965ee25dd632d907f69e5ea6f4f81f35c0cf6a7
7 changes: 0 additions & 7 deletions .ci/scripts/build_examples_uwp.sh

This file was deleted.

5 changes: 0 additions & 5 deletions .ci/targets/uwp_build_and_platform_tests.yaml

This file was deleted.

16 changes: 14 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
gcp_credentials: ENCRYPTED[!2c88dee9c9d9805b214c9f7ad8f3bc8fae936cdb0f881d562101151c408c7e024a41222677d5831df90c60d2dd6cd80a!]

# Don't run on release tags since it creates O(n^2) tasks where n is the
# number of plugins
only_if: $CIRRUS_TAG == ''
# number of plugins.
# Don't run on 'master' since it's a mirror of 'main'.
only_if: $CIRRUS_TAG == '' && $CIRRUS_BRANCH != 'master'
env:
CHANNEL: "master" # Default to master when not explicitly set by a task.
PLUGIN_TOOL: "./script/tool/bin/flutter_plugin_tools.dart"
Expand Down Expand Up @@ -101,6 +102,13 @@ task:
always:
format_script: ./script/tool_runner.sh format --fail-on-change
pubspec_script: ./script/tool_runner.sh pubspec-check
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
license_script: dart $PLUGIN_TOOL license-check
- name: federated_safety
# This check is only meaningful for PRs, as it validates changes
Expand Down Expand Up @@ -154,6 +162,10 @@ task:
analyze_script:
- ./script/tool_runner.sh analyze --skip-if-not-supporting-flutter-version="$CHANNEL" --custom-analysis=script/configs/custom_analysis.yaml
- echo "If this test fails, the minumum Flutter version should be updated"
- name: readme_excerpts
env:
CIRRUS_CLONE_SUBMODULES: true
script: ./script/tool_runner.sh update-excerpts --fail-on-change
### Web tasks ###
- name: web-build_all_plugins
env:
Expand Down
289 changes: 289 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,289 @@
version: 2
updates:
- package-ecosystem: "gradle"
directory: "/packages/camera/camera/android"
commit-message:
prefix: "[camera]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/camera/camera/example/android/app"
commit-message:
prefix: "[camera]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/espresso/android"
commit-message:
prefix: "[espresso]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/espresso/example/android/app"
commit-message:
prefix: "[espresso]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/flutter_plugin_android_lifecycle/android"
commit-message:
prefix: "[lifecycle]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/flutter_plugin_android_lifecycle/example/android/app"
commit-message:
prefix: "[lifecycle]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/google_maps_flutter/google_maps_flutter/android"
commit-message:
prefix: "[google_maps]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/google_maps_flutter/google_maps_flutter/example/android/app"
commit-message:
prefix: "[google_maps]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/google_sign_in/google_sign_in/example/android/app"
commit-message:
prefix: "[sign_in]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/google_sign_in/google_sign_in_android/android"
commit-message:
prefix: "[sign_in]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/google_sign_in/google_sign_in_android/example/android/app"
commit-message:
prefix: "[sign_in]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/in_app_purchase/in_app_purchase_android/android"
commit-message:
prefix: "[in_app_pur]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/in_app_purchase/in_app_purchase_android/example/android/app"
commit-message:
prefix: "[in_app_pur]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/in_app_purchase/in_app_purchase/example/android/app"
commit-message:
prefix: "[in_app_pur]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/image_picker/image_picker/example/android/app"
commit-message:
prefix: "[image_picker]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/image_picker/image_picker_android/android"
commit-message:
prefix: "[image_picker]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/image_picker/image_picker_android/example/android/app"
commit-message:
prefix: "[image_picker]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/local_auth/local_auth_android/android"
commit-message:
prefix: "[local_auth]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/local_auth/local_auth_android/example/android/app"
commit-message:
prefix: "[local_auth]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/local_auth/local_auth/example/android/app"
commit-message:
prefix: "[local_auth]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/path_provider/path_provider/example/android/app"
commit-message:
prefix: "[path_provider]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/path_provider/path_provider_android/android"
commit-message:
prefix: "[path_provider]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/path_provider/path_provider_android/example/android/app"
commit-message:
prefix: "[path_provider]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/quick_actions/quick_actions_android/android"
commit-message:
prefix: "[quick_actions]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/quick_actions/quick_actions_android/example/android/app"
commit-message:
prefix: "[quick_actions]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/quick_actions/quick_actions/example/android/app"
commit-message:
prefix: "[quick_actions]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/shared_preferences/shared_preferences/example/android/app"
commit-message:
prefix: "[shared_pref]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/shared_preferences/shared_preferences_android/example/android/app"
commit-message:
prefix: "[shared_pref]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/url_launcher/url_launcher_android/android"
commit-message:
prefix: "[url_launcher]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/url_launcher/url_launcher_android/example/android/app"
commit-message:
prefix: "[url_launcher]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/url_launcher/url_launcher/example/android/app"
commit-message:
prefix: "[url_launcher]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/video_player/video_player_android/android"
commit-message:
prefix: "[video_player]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/video_player/video_player_android/example/android/app"
commit-message:
prefix: "[video_player]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/webview_flutter/webview_flutter/example/android/app"
commit-message:
prefix: "[webview]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/webview_flutter/webview_flutter_android/android"
commit-message:
prefix: "[webview]"
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/packages/webview_flutter/webview_flutter_android/example/android"
commit-message:
prefix: "[webview]"
schedule:
interval: "daily"
open-pull-requests-limit: 10
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "site-shared"]
path = site-shared
url = https://github.com/dart-lang/site-shared
Loading

0 comments on commit c209461

Please sign in to comment.