Skip to content

Commit

Permalink
Merge pull request #1 from flutter/main
Browse files Browse the repository at this point in the history
sync with the latest version of the official repository
  • Loading branch information
arc-yong authored Dec 6, 2024
2 parents dd04ab1 + 45bcc32 commit 4b9c79f
Show file tree
Hide file tree
Showing 3,059 changed files with 343,371 additions and 76,079 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
57 changes: 44 additions & 13 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ platform_properties:
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"},
{"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
]
linux_android_legacy:
properties:
Expand All @@ -44,7 +44,7 @@ platform_properties:
{"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"},
{"dependency": "android_virtual_device", "version": "generic_android22.textpb"},
{"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
]
linux_desktop:
properties:
Expand All @@ -65,7 +65,7 @@ platform_properties:
device_type: none
dependencies: >-
[
{"dependency": "chrome_and_driver", "version": "version:114.0"}
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
]
windows_arm64:
properties:
Expand Down Expand Up @@ -292,21 +292,21 @@ targets:
timeout: 30
properties:
target_file: analyze_legacy.yaml
channel: "3.22.0"
channel: "3.22.3"
env_variables: >-
{
"CHANNEL": "3.22.0"
"CHANNEL": "3.22.3"
}
- name: Linux analyze_legacy N-2
recipe: packages/packages
timeout: 30
properties:
target_file: analyze_legacy.yaml
channel: "3.16.9"
channel: "3.19.6"
env_variables: >-
{
"CHANNEL": "3.16.9"
"CHANNEL": "3.19.6"
}
- name: Linux_android custom_package_tests master
Expand All @@ -327,7 +327,7 @@ targets:
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
]
channel: master
env_variables: >-
Expand All @@ -350,7 +350,7 @@ targets:
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
]
channel: stable
env_variables: >-
Expand All @@ -364,7 +364,24 @@ targets:
timeout: 30
properties:
version_file: flutter_master.version
target_file: android_build_all_packages.yaml
# This builds the all_packages app only in a current JDK.
target_file: android_build_all_packages_jdk17.yaml
channel: master
env_variables: >-
{
"CHANNEL": "master"
}
- name: Linux_android android_build_all_packages_legacy master
recipe: packages/packages
timeout: 30
properties:
version_file: flutter_master.version
# TODO(stuartmorgan): Once stable requires JDK 17, and the
# legacy project is updated accordingly, this entire target
# can be merged back into android_build_all_packages.
# This file only builds a *legacy* version of the project.
target_file: android_build_all_packages_legacy.yaml
channel: master
# The legacy project build requires an older JDK.
dependencies: >-
Expand All @@ -382,7 +399,21 @@ targets:
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
target_file: android_build_all_packages.yaml
# This builds the all_packages app only in a current JDK.
target_file: android_build_all_packages_jdk17.yaml
channel: stable
env_variables: >-
{
"CHANNEL": "stable"
}
- name: Linux_android android_build_all_packages_legacy stable
recipe: packages/packages
timeout: 30
properties:
version_file: flutter_stable.version
# This file only builds a *legacy* version of the project.
target_file: android_build_all_packages_legacy.yaml
channel: stable
# The legacy project build requires an older JDK.
dependencies: >-
Expand Down Expand Up @@ -935,7 +966,7 @@ targets:
# Install Chrome as a default handler for schemes for url_launcher.
dependencies: >-
[
{"dependency": "chrome_and_driver", "version": "version:114.0"}
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
]
env_variables: >-
{
Expand All @@ -953,7 +984,7 @@ targets:
# Install Chrome as a default handler for schemes for url_launcher.
dependencies: >-
[
{"dependency": "chrome_and_driver", "version": "version:114.0"}
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
]
env_variables: >-
{
Expand Down
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
01db23b8223303b28568483bd78a5c258b4a8ded
ab5b20c16d56c8e608773ce65c3f7c39d515d4a5
2 changes: 1 addition & 1 deletion .ci/flutter_stable.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
761747bfc538b5af34aa0d3fac380f1bc331ec49
dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
2 changes: 1 addition & 1 deletion .ci/legacy_project/all_packages/android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ gradle-wrapper.jar
GeneratedPluginRegistrant.java

# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
# See https://flutter.dev/to/reference-keystore
key.properties
1 change: 1 addition & 0 deletions .ci/legacy_project/all_packages/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace = "com.example.all_packages"
compileSdkVersion 33

defaultConfig {
Expand Down
13 changes: 12 additions & 1 deletion .ci/scripts/create_all_packages_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,16 @@
# found in the LICENSE file.
set -e

# The base exclusion file for all_packages app.
exclusions=("script/configs/exclude_all_packages_app.yaml")

# Add a wasm-specific exclusion file if "--wasm" is specified.
if [[ "$1" == "--wasm" ]]; then
exclusions+=",script/configs/exclude_all_packages_app_wasm.yaml"
fi

# Delete ./all_packages if it exists already
rm -rf ./all_packages

dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
--output-dir=. --exclude script/configs/exclude_all_packages_app.yaml
--output-dir=. --exclude "$exclusions"
8 changes: 8 additions & 0 deletions .ci/scripts/plugin_tools_format.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
set -e

cd script/tool
dart format --set-exit-if-changed .
14 changes: 14 additions & 0 deletions .ci/targets/android_build_all_packages_jdk17.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This only builds the modern all_packages app, which requires jdk17+
tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
infra_step: true # Note infra steps failing prevents "always" from running.
- name: create all_packages app
script: .ci/scripts/create_all_packages_app.sh
infra_step: true # Note infra steps failing prevents "always" from running.
- name: build all_packages for Android debug
script: .ci/scripts/build_all_packages_app.sh
args: ["apk", "debug"]
- name: build all_packages for Android release
script: .ci/scripts/build_all_packages_app.sh
args: ["apk", "release"]
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
# This only builds the legacy all_packages app, which requires jdk11
tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
infra_step: true # Note infra steps failing prevents "always" from running.
- name: create all_packages app
script: .ci/scripts/create_all_packages_app.sh
infra_step: true # Note infra steps failing prevents "always" from running.
- name: build all_packages for Android debug
script: .ci/scripts/build_all_packages_app.sh
args: ["apk", "debug"]
- name: build all_packages for Android release
script: .ci/scripts/build_all_packages_app.sh
args: ["apk", "release"]
- name: create all_packages app - legacy version
script: .ci/scripts/create_all_packages_app_legacy.sh
# Output dir; must match the final argument to build_all_packages_app_legacy
Expand Down
2 changes: 1 addition & 1 deletion .ci/targets/ios_platform_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tasks:
- name: xcode analyze deprecation
# Ensure we don't accidentally introduce deprecated code.
script: .ci/scripts/tool_runner.sh
args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"]
args: ["xcode-analyze", "--ios", "--ios-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml"]
- name: native test
script: .ci/scripts/tool_runner.sh
# Simulator name and version must match name and version in create_simulator.sh
Expand Down
2 changes: 1 addition & 1 deletion .ci/targets/macos_platform_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tasks:
- name: xcode analyze deprecation
# Ensure we don't accidentally introduce deprecated code.
script: .ci/scripts/tool_runner.sh
args: ["xcode-analyze", "--macos", "--macos-min-version=12.3"]
args: ["xcode-analyze", "--macos", "--macos-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml"]
- name: native test
script: .ci/scripts/tool_runner.sh
args: ["native-test", "--macos"]
Expand Down
11 changes: 10 additions & 1 deletion .ci/targets/repo_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@ tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
infra_step: true # Note infra steps failing prevents "always" from running.
# format requires that 'pub get' has been run to determine the language
# version, so the tool will auto-run it if necessary. Run it manually first
# so that the network requests are in a separate infra step.
- name: download Dart deps
script: .ci/scripts/tool_runner.sh
args: ["fetch-deps"]
infra_step: true
- name: tool unit tests
script: .ci/scripts/plugin_tools_tests.sh
- name: tool format
script: .ci/scripts/plugin_tools_format.sh
- name: format
script: .ci/scripts/tool_runner.sh
# Skip Swift formatting on Linux builders.
Expand All @@ -19,7 +28,7 @@ tasks:
script: .ci/scripts/tool_runner.sh
args:
- "pubspec-check"
- "--min-min-flutter-version=3.16.0"
- "--min-min-flutter-version=3.19.0"
- "--allow-dependencies=script/configs/allowed_unpinned_deps.yaml"
- "--allow-pinned-dependencies=script/configs/allowed_pinned_deps.yaml"
always: true
Expand Down
7 changes: 7 additions & 0 deletions .ci/targets/web_build_all_packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@ tasks:
- name: build all_packages app for Web release
script: .ci/scripts/build_all_packages_app.sh
args: ["web", "release"]
- name: (Wasm) create all_packages app
script: .ci/scripts/create_all_packages_app.sh
args: ["--wasm"]
infra_step: true # Note infra steps failing prevents "always" from running.
- name: (Wasm) build all_packages app for Web release
script: .ci/scripts/build_all_packages_app.sh
args: ["web", "release", "--wasm"]
Loading

0 comments on commit 4b9c79f

Please sign in to comment.