Skip to content

Commit ea4043b

Browse files
Merge branch 'main' into iap_sk2_userCancelled
2 parents a163718 + 172ced2 commit ea4043b

File tree

379 files changed

+16754
-6724
lines changed

Some content is hidden

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

379 files changed

+16754
-6724
lines changed

.ci.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,6 @@ targets:
250250
251251
# Wasm unit tests in master
252252
- name: Linux_web web_dart_unit_test_wasm_shard_1 master
253-
# Broken on master. See flutter/flutter#170433 and
254-
# flutter/flutter#170434
255-
bringup: true
256253
recipe: packages/packages
257254
timeout: 60
258255
properties:
@@ -268,9 +265,6 @@ targets:
268265
}
269266
270267
- name: Linux_web web_dart_unit_test_wasm_shard_2 master
271-
# Broken on master. See flutter/flutter#170433 and
272-
# flutter/flutter#170434
273-
bringup: true
274268
recipe: packages/packages
275269
timeout: 60
276270
properties:
@@ -400,7 +394,7 @@ targets:
400394
### Android tasks ###
401395
- name: Linux_android android_build_all_packages master
402396
recipe: packages/packages
403-
timeout: 30
397+
timeout: 60
404398
properties:
405399
version_file: flutter_master.version
406400
# This builds the all_packages app only in a current JDK.
@@ -413,7 +407,7 @@ targets:
413407
414408
- name: Linux_android android_build_all_packages stable
415409
recipe: packages/packages
416-
timeout: 30
410+
timeout: 60
417411
properties:
418412
add_recipes_cq: "true"
419413
version_file: flutter_stable.version
@@ -1437,7 +1431,6 @@ targets:
14371431
recipe: packages/packages
14381432
presubmit: false
14391433
timeout: 30
1440-
bringup: true # https://github.com/flutter/flutter/issues/134083
14411434
properties:
14421435
add_recipes_cq: "true"
14431436
target_file: windows_build_all_packages.yaml
@@ -1472,7 +1465,6 @@ targets:
14721465
recipe: packages/packages
14731466
presubmit: false
14741467
timeout: 30
1475-
bringup: true
14761468
properties:
14771469
target_file: windows_build_all_packages.yaml
14781470
channel: stable

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a930ec1a6c099b8cba876d319bb610ecedb0b04a
1+
34c2a3b158b2b395cd31351c1e8a94ed4d9892b4

.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
1+
edada7c56edf4a183c1735310e123c7f923584f1

.ci/legacy_project/README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,17 @@ and then deleting everything but `android/` from it:
4141
`build.gradle` to maintain compatibility with plugins that use
4242
Flutter's most recently supported API version.
4343
- Modifies `gradle-wrapper.properties` to upgrade the Gradle version
44-
from 6.7 to 8.4. If a user runs into an error with the Gradle
44+
from 8.4 to 8.7. If a user runs into an error with the Gradle
4545
version, the warning is clear on how to upgrade the version to
4646
one that we support.
4747
- Modifies `settings.gradle` to upgrade the Android Gradle Plugin (AGP)
48-
from version 4.1.0 (originally set in `build.gradle`; see bullet below)
49-
to 8.3.0. If a user runs into an error with the AGP version, the warning
48+
from version 8.3.0 (originally set in `build.gradle`; see bullet below)
49+
to 8.6.0. If a user runs into an error with the AGP version, the warning
5050
is clear on how to upgrade the version to one that we support.
5151
- Refactor plugin to use declarative Gradle apply instead of the
5252
imperative apply (this includes moving where the Android Gradle
5353
Plugin (AGP) version is set from `build.gradle` to `settings.gradle`).
54+
- Modifies `settings.gradle` to upgrade the Kotlin Gradle Plugin (KGP)
55+
from version 1.9.0 to 2.1.0. If a user runs into an error with the AGP version,
56+
the warning is clear on how to upgrade the version to one that we support.
57+
- Modifies `gradle.properties` to not set android.enableJetifier=true.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
org.gradle.jvmargs=-Xmx4G
22
android.useAndroidX=true
3-
android.enableJetifier=true

.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

.ci/legacy_project/all_packages/android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ pluginManagement {
1919
// See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info.
2020
plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
22-
id "com.android.application" version "8.3.0" apply false
23-
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
22+
id "com.android.application" version "8.6.0" apply false
23+
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
2424
}
2525

2626
include ":app"

.ci/targets/macos_repo_checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ tasks:
1313
always: true
1414
- name: validate iOS and macOS podspecs
1515
script: .ci/scripts/tool_runner.sh
16-
args: ["podspec-check"]
16+
args: ["podspec-check", "--exclude=script/configs/exclude_xcode_deprecation.yaml"]
1717
always: true

.gemini/config.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Minimize verbosity.
2+
have_fun: false
3+
code_review:
4+
# For now, use the default of MEDIUM for testing. Based on desired verbosity,
5+
# we can change this to LOW or HIGH in the future.
6+
comment_severity_threshold: MEDIUM
7+
pull_request_opened:
8+
# Explicitly set help to false in case the default changes in the future, as
9+
# having a help message on every PR would be spammy.
10+
help: false
11+
# These tend to be verbose, and since we expect PR authors to clearly
12+
# describe their PRs this would be at best duplicative.
13+
summary: false
14+
ignore_patterns:
15+
- .ci/flutter_master.version
16+
- .ci/flutter_stable.version

.gemini/styleguide.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Flutter Packages Style Guide
2+
3+
## Introduction
4+
5+
This style guide outlines the coding conventions for contributions to the
6+
flutter/packages repository.
7+
8+
## Style Guides
9+
10+
Code should follow the relevant style guides, and use the correct
11+
auto-formatter, for each language, as described in
12+
[the repository contributing guide's Style section](https://github.com/flutter/packages/blob/main/CONTRIBUTING.md#style).
13+
14+
## Best Practices
15+
16+
- Code should follow the guidance and principles described in
17+
[the flutter/packages contribution guide](https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md).
18+
- Code should be tested. Changes to plugin packages, which include code written
19+
in C, C++, Java, Kotlin, Objective-C, or Swift, should have appropriate tests
20+
as described in [the plugin test guidance](https://github.com/flutter/flutter/blob/master/docs/ecosystem/testing/Plugin-Tests.md).
21+
- PR descriptions should include the Pre-Review Checklist from
22+
[the PR template](https://github.com/flutter/packages/blob/main/.github/PULL_REQUEST_TEMPLATE.md),
23+
with all of the steps completed.

0 commit comments

Comments
 (0)