Skip to content

Commit 72e55e2

Browse files
bhaveshhztbhaveshhzt
committed
Merge branch 'master' into webview_file_picker
* master: (397 commits) [in_app_purchase] Implementation of platform interface (flutter#3781) [google_sign_in] Add todo WRT correctly setting X-Goog-AuthUser header (flutter#3819) [tools] fix version check command not working for new packages (flutter#3818) [camera] android-rework part 1: Base classes to support Android Camera features (flutter#3795) fix MD (flutter#3815) Path provider windows crash fix (flutter#3814) [local_auth] docs update (flutter#3103) Update PULL_REQUEST_TEMPLATE.md (flutter#3801) [quick_actions] handle cold start on iOS correctly (flutter#3811) Replace path_provider_linux widget tests with simple unit tests (flutter#3812) [sensors] format dart code based on the new dart formatter (flutter#3809) [google_sign_in] Fix "pick account" on iOS (flutter#3805) [image_picker_platform_interface] Added pickMultiImage (flutter#3782) [in_app_purchase] Added currency code and numerical price to product detail model. (flutter#3794) [local_auth] Fix iOS crash when no localizedReason (flutter#3780) Fix and update version checks (flutter#3792) [in_app_purchase] Configured example app to use StoreKit Testing on iOS 14 (flutter#3772) [local_auth] Unnecessary reassignment in example removed (flutter#2983) [flutter_webview] Fix `allowsInlineMediaPlayback` ignored on iOS (flutter#3791) Switch script/tools over to the new analysis options (flutter#3777) ...
2 parents f7ea41d + 66972ed commit 72e55e2

2,271 files changed

Lines changed: 60653 additions & 34328 deletions

File tree

Some content is hidden

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

‎.ci/Dockerfile‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN sudo apt-get install -y --no-install-recommends gnupg
66

77
# Add repo for gcloud sdk and install it
88
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
9+
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
1010

1111
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
1212
sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
@@ -23,7 +23,21 @@ RUN yes | sdkmanager \
2323

2424
RUN yes | sdkmanager --licenses
2525

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

‎.ci/Dockerfile-LinuxDesktop‎

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

0 commit comments

Comments
 (0)