Skip to content

Commit 419b195

Browse files
author
Marina González
committed
Merge branch 'master' into quick_actions_mindapps
* master: (1126 commits) [webview_flutter] Adjust test URLs again (flutter#4407) [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179) [camera] Add filter for unsupported cameras on Android (flutter#4418) [webview_flutter] Update webview platform interface with new methods for running JavaScript. (flutter#4401) [webview_flutter] Add zoomEnabled to webview flutter platform interface (flutter#4404) [ci] Remove obsolete Dockerfile (flutter#4405) Fix order-dependant platform interface tests (flutter#4406) [google_maps_flutter]: LatLng longitude loses precision in constructor #90574 (flutter#4374) [google_maps_flutter] Add Marker drag events (flutter#2838) [flutter_plugin_tools] Validate pubspec description (flutter#4396) Add file_selector to the repo list (flutter#4395) [in_app_purchase] Fix in_app_purchase_android/README.md (flutter#4363) [google_maps_flutter_web] Add Marker drag events (flutter#4385) [webview_flutter] Fixed todos in FlutterWebView.java (flutter#4394) Handle `PurchaseStatus.restored` correctly in example. (flutter#4393) Handle restored purchases in iOS example app (flutter#4392) [file_selector] Remove custom analysis options (flutter#4382) [flutter_plugin_tools] Check licenses in Kotlin (flutter#4373) Fixed _CastError when running example App (flutter#4390) [in_app_purchase] Ensure the introductoryPriceMicros field is transported as a String. (flutter#4370) ... # Conflicts: # packages/quick_actions/ios/Classes/FLTQuickActionsPlugin.m
2 parents d8d413a + c254963 commit 419b195

File tree

3,553 files changed

+158657
-54615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,553 files changed

+158657
-54615
lines changed

‎.ci.yaml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
# Describes the targets run in continuous integration environment.
2+
#
3+
# Flutter infra uses this file to generate a checklist of tasks to be performed
4+
# for every commit.
5+
#
6+
# More information at:
7+
# * https://github.com/flutter/cocoon/blob/master/CI_YAML.md
8+
enabled_branches:
9+
- master
10+
11+
platform_properties:
12+
linux:
13+
properties:
14+
caches: >-
15+
[
16+
]
17+
dependencies: >
18+
[
19+
{"dependency": "curl"}
20+
]
21+
device_type: none
22+
os: Linux
23+
windows:
24+
properties:
25+
caches: >-
26+
[
27+
{"name": "vsbuild", "path": "vsbuild"},
28+
{"name": "pub_cache", "path": ".pub-cache"}
29+
]
30+
dependencies: >
31+
[
32+
{"dependency": "certs"}
33+
]
34+
device_type: none
35+
os: Windows
36+
37+
targets:
38+
- name: Windows win32-platform_tests master
39+
recipe: plugins/plugins
40+
timeout: 30
41+
properties:
42+
add_recipes_cq: "true"
43+
target_file: windows_build_and_platform_tests.yaml
44+
dependencies: >
45+
[
46+
{"dependency": "vs_build"}
47+
]
48+
scheduler: luci
49+
50+
- name: Windows win32-platform_tests stable
51+
recipe: plugins/plugins
52+
timeout: 30
53+
properties:
54+
add_recipes_cq: "true"
55+
target_file: windows_build_and_platform_tests.yaml
56+
channel: stable
57+
dependencies: >
58+
[
59+
{"dependency": "vs_build"}
60+
]
61+
scheduler: luci
62+
63+
- name: Windows windows-build_all_plugins master
64+
recipe: plugins/plugins
65+
timeout: 30
66+
properties:
67+
add_recipes_cq: "true"
68+
target_file: build_all_plugins.yaml
69+
dependencies: >
70+
[
71+
{"dependency": "vs_build"}
72+
]
73+
scheduler: luci
74+
75+
- name: Windows windows-build_all_plugins stable
76+
recipe: plugins/plugins
77+
timeout: 30
78+
properties:
79+
add_recipes_cq: "true"
80+
target_file: build_all_plugins.yaml
81+
channel: stable
82+
dependencies: >
83+
[
84+
{"dependency": "vs_build"}
85+
]
86+
scheduler: luci
87+
88+
- name: Windows uwp-platform_tests master
89+
recipe: plugins/plugins
90+
timeout: 30
91+
properties:
92+
add_recipes_cq: "true"
93+
target_file: uwp_build_and_platform_tests.yaml
94+
dependencies: >
95+
[
96+
{"dependency": "vs_build"}
97+
]
98+
scheduler: luci
99+
100+
- name: Windows plugin_tools_tests
101+
recipe: plugins/plugins
102+
timeout: 30
103+
properties:
104+
add_recipes_cq: "true"
105+
target_file: plugin_tools_tests.yaml
106+
scheduler: luci
107+
108+
- name: Linux ci_yaml plugins roller
109+
recipe: infra/ci_yaml
110+
timeout: 30
111+
scheduler: luci
112+
runIf:
113+
- .ci.yaml

‎.ci/Dockerfile‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
FROM cirrusci/flutter:stable
1+
# The Flutter version is not important here, since the CI scripts update Flutter
2+
# before running. What matters is that the base image is pinned to minimize
3+
# unintended changes when modifying this file.
4+
FROM cirrusci/flutter:2.2.2
25

3-
RUN sudo apt-get update -y
6+
RUN apt-get update -y
47

5-
RUN sudo apt-get install -y --no-install-recommends gnupg
8+
# Required by Roboeletric and the Android SDK.
9+
RUN apt-get install -y openjdk-8-jdk
10+
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
11+
12+
RUN apt-get install -y --no-install-recommends gnupg
613

714
# Add repo for gcloud sdk and install it
815
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
9-
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
16+
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
1017

1118
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
1219
sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
1320

14-
RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \
21+
RUN apt-get update && apt-get install -y google-cloud-sdk && \
1522
gcloud config set core/disable_usage_reporting true && \
1623
gcloud config set component_manager/disable_update_check true
1724

@@ -23,7 +30,21 @@ RUN yes | sdkmanager \
2330

2431
RUN yes | sdkmanager --licenses
2532

33+
# Install formatter.
34+
RUN apt-get install -y clang-format
35+
36+
# Install xvfb to allow running headless
37+
RUN apt-get install -y xvfb libegl1-mesa
38+
# Install Linux desktop build tool requirements.
39+
RUN apt-get install -y clang cmake ninja-build file pkg-config
40+
# Install necessary libraries.
41+
RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
42+
2643
# Add repo for Google Chrome and install it
2744
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
2845
RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
29-
RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends google-chrome-stable
46+
RUN apt-get update && apt-get install -y --no-install-recommends google-chrome-stable
47+
48+
# Make Chrome the default so http: has a handler for url_launcher tests.
49+
RUN apt-get install -y xdg-utils
50+
RUN xdg-settings set default-web-browser google-chrome.desktop

‎.ci/Dockerfile-LinuxDesktop‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.ci/scripts/build_all_plugins.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
cd all_plugins
7+
flutter build windows --debug
8+
flutter build windows --release

‎.ci/scripts/build_examples_uwp.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --winuwp \
7+
--packages-for-branch

‎.ci/scripts/build_examples_win32.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --windows \
7+
--packages-for-branch

‎.ci/scripts/create_all_plugins_app.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart all-plugins-app \
7+
--output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml

‎.ci/scripts/drive_examples_win32.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart drive-examples --windows \
7+
--packages-for-branch

‎.ci/scripts/native_test_win32.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart native-test --windows \
7+
--no-integration --packages-for-branch

‎.ci/scripts/plugin_tools_tests.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
cd script/tool
7+
dart pub run test

0 commit comments

Comments
 (0)