Skip to content

Commit 46c4d0d

Browse files
Merge branch 'main' into camera-windows-example-deprecation
2 parents 88d86e1 + 4b04fd7 commit 46c4d0d

File tree

889 files changed

+20500
-16633
lines changed

Some content is hidden

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

889 files changed

+20500
-16633
lines changed

.ci.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ platform_properties:
2929
dependencies: >-
3030
[
3131
{"dependency": "android_sdk", "version": "version:36v3"},
32-
{"dependency": "open_jdk", "version": "version:17"},
32+
{"dependency": "open_jdk", "version": "version:21"},
3333
{"dependency": "curl", "version": "version:7.64.0"},
3434
{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"},
3535
{"dependency": "ninja", "version": "version:1.9.0"}
@@ -95,7 +95,7 @@ platform_properties:
9595
[
9696
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
9797
]
98-
os: Mac-14|Mac-15.5
98+
os: Mac-15.5|Mac-15.7
9999
device_type: none
100100
cpu: arm64
101101
$flutter/osx_sdk : >-
@@ -108,7 +108,7 @@ platform_properties:
108108
[
109109
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
110110
]
111-
os: Mac-14|Mac-15.5
111+
os: Mac-15.5|Mac-15.7
112112
device_type: none
113113
cpu: x86
114114
$flutter/osx_sdk : >-
@@ -129,7 +129,7 @@ targets:
129129
dependencies: >-
130130
[
131131
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
132-
{"dependency": "open_jdk", "version": "version:17"}
132+
{"dependency": "open_jdk", "version": "version:21"}
133133
]
134134
env_variables: >-
135135
{
@@ -327,21 +327,21 @@ targets:
327327
timeout: 30
328328
properties:
329329
target_file: analyze_legacy.yaml
330-
channel: "3.32.8"
330+
channel: "3.35.7"
331331
env_variables: >-
332332
{
333-
"CHANNEL": "3.32.8"
333+
"CHANNEL": "3.35.7"
334334
}
335335
336336
- name: Linux analyze_legacy N-2
337337
recipe: packages/packages
338338
timeout: 30
339339
properties:
340340
target_file: analyze_legacy.yaml
341-
channel: "3.29.3"
341+
channel: "3.32.8"
342342
env_variables: >-
343343
{
344-
"CHANNEL": "3.29.3"
344+
"CHANNEL": "3.32.8"
345345
}
346346
347347
- name: Linux_android custom_package_tests master

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c5e809a998fe86bb4a4502d51996504279c67ec5
1+
de4be4f3892d78b768128e0f46e7a79b65dbfb8c

.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
adc901062556672b4138e18a4dc62a4be8f4b3c2
1+
b45fa18946ecc2d9b4009952c636ba7e2ffbb787

.ci/legacy_project/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ 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 8.4 to 8.7. If a user runs into an error with the Gradle
44+
from 8.4 to 8.11.1. 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)
4848
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
49+
to 8.9.1. 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

.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.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ 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.6.0" apply false
22+
id "com.android.application" version "8.9.1" apply false
2323
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
2424
}
2525

.ci/targets/repo_checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tasks:
2828
script: .ci/scripts/tool_runner.sh
2929
args:
3030
- "pubspec-check"
31-
- "--min-min-flutter-version=3.27.0"
31+
- "--min-min-flutter-version=3.32.0"
3232
- "--allow-dependencies=script/configs/allowed_unpinned_deps.yaml"
3333
- "--allow-pinned-dependencies=script/configs/allowed_pinned_deps.yaml"
3434
always: true

.github/dependabot.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,11 @@ updates:
115115
- "junit:junit"
116116
- "org.mockito:*"
117117
- "org.robolectric:*"
118-
gradle-plugin:
118+
kotlin-gradle-plugin:
119119
patterns:
120120
- "org.jetbrains.kotlin:kotlin-gradle-plugin"
121+
gradle-plugin:
122+
patterns:
121123
- "com.android.tools.build:gradle"
122124
androidx:
123125
patterns:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# the change if it doesn't.
3232
run: |
3333
cd $HOME
34-
git clone https://github.com/flutter/flutter.git --depth 1 -b 3.35.0 _flutter
34+
git clone https://github.com/flutter/flutter.git --depth 1 -b 3.38.1 _flutter
3535
echo "$HOME/_flutter/bin" >> $GITHUB_PATH
3636
cd $GITHUB_WORKSPACE
3737
# Checks out a copy of the repo.

CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ packages/espresso/** @jesswrd
7171
packages/file_selector/file_selector_android/** @mboetger
7272
packages/flutter_plugin_android_lifecycle/** @reidbaker
7373
packages/google_maps_flutter/google_maps_flutter_android/** @reidbaker
74-
packages/google_sign_in/google_sign_in_android/** @ash2moon
74+
packages/google_sign_in/google_sign_in_android/** @reidbaker
7575
packages/image_picker/image_picker_android/** @gmackall
7676
packages/in_app_purchase/in_app_purchase_android/** @gmackall
7777
packages/local_auth/local_auth_android/** @mboetger
7878
packages/path_provider/path_provider_android/** @camsim99
79-
packages/quick_actions/quick_actions_android/** @ash2moon
79+
packages/quick_actions/quick_actions_android/** @reidbaker
8080
packages/shared_preferences/shared_preferences_android/** @jesswrd
8181
packages/url_launcher/url_launcher_android/** @gmackall
82-
packages/video_player/video_player_android/** @ash2moon
82+
packages/video_player/video_player_android/** @reidbaker
8383
# Owned by ecosystem team for now during the wrapper evaluation.
8484
packages/webview_flutter/webview_flutter_android/** @bparrishMines
8585

0 commit comments

Comments
 (0)