Skip to content

Commit df76e18

Browse files
authored
Merge branch 'main' into dependabot-group-tests
2 parents 40d79b8 + 2dc8b98 commit df76e18

File tree

727 files changed

+37648
-29446
lines changed

Some content is hidden

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

727 files changed

+37648
-29446
lines changed

.ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ platform_properties:
3131
{"dependency": "android_sdk", "version": "version:33v6"},
3232
{"dependency": "open_jdk", "version": "version:17"},
3333
{"dependency": "curl", "version": "version:7.64.0"},
34-
{"dependency": "avd_cipd_version", "version": "build_id:8739520057779466577"}
34+
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
3535
]
3636
linux_android_legacy:
3737
properties:
@@ -44,7 +44,7 @@ platform_properties:
4444
{"dependency": "open_jdk", "version": "version:17"},
4545
{"dependency": "curl", "version": "version:7.64.0"},
4646
{"dependency": "android_virtual_device", "version": "generic_android22.textpb"},
47-
{"dependency": "avd_cipd_version", "version": "build_id:8739520057779466577"}
47+
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
4848
]
4949
linux_desktop:
5050
properties:

.ci/flutter_master.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ed553d10cf6370065c12d372027ff2d0cf621cf1
1+
ab5b20c16d56c8e608773ce65c3f7c39d515d4a5

.github/dependabot.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ updates:
4747
- /packages/palette_generator/example/android/app
4848
- /packages/path_provider/path_provider/example/android/app
4949
- /packages/path_provider/path_provider_android/example/android/app
50-
- /packages/platform/example/android/app
5150
- /packages/pigeon/example/app/android/app
5251
- /packages/pigeon/platform_tests/test_plugin/example/android/app
5352
- /packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app
@@ -70,6 +69,8 @@ updates:
7069
prefix: "[gradle]"
7170
schedule:
7271
interval: "weekly"
72+
labels:
73+
- "autosubmit"
7374
open-pull-requests-limit: 10
7475
ignore:
7576
- dependency-name: "*"
@@ -110,6 +111,8 @@ updates:
110111
- "junit:junit"
111112
- "org.mockito:*"
112113
- "org.robolectric:*"
114+
labels:
115+
- "autosubmit"
113116
ignore:
114117
- dependency-name: "com.android.tools.build:gradle"
115118
update-types: ["version-update:semver-minor", "version-update:semver-patch"]

.github/labeler.yml

+5
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@
8989
- any-glob-to-any-file:
9090
- packages/go_router_builder/**/*
9191

92+
'p: google_adsense':
93+
- changed-files:
94+
- any-glob-to-any-file:
95+
- packages/google_adsense/**
96+
9297
'p: google_identity_services':
9398
- changed-files:
9499
- any-glob-to-any-file:

CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ packages/flutter_migrate/** @stuartmorgan
1818
packages/flutter_template_images/** @stuartmorgan
1919
packages/go_router/** @chunhtai
2020
packages/go_router_builder/** @chunhtai
21+
packages/google_adsense/** @sokoloff06 @ditman
2122
packages/google_identity_services_web/** @ditman
2223
packages/google_maps_flutter/** @stuartmorgan
2324
packages/google_sign_in/** @stuartmorgan

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ These are the packages hosted in this repository:
5454
| [flutter\_template\_images](./packages/flutter_template_images/) | [![pub package](https://img.shields.io/pub/v/flutter_template_images.svg)](https://pub.dev/packages/flutter_template_images) | [![pub points](https://img.shields.io/pub/points/flutter_template_images)](https://pub.dev/packages/flutter_template_images/score) | [![popularity](https://img.shields.io/pub/popularity/flutter_template_images)](https://pub.dev/packages/flutter_template_images/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20flutter_template_images?label=)](https://github.com./flutter/flutter/labels/p%3A%20flutter_template_images) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20flutter_template_images?label=)](https://github.com./flutter/packages/labels/p%3A%20flutter_template_images) |
5555
| [go\_router](./packages/go_router/) | [![pub package](https://img.shields.io/pub/v/go_router.svg)](https://pub.dev/packages/go_router) | [![pub points](https://img.shields.io/pub/points/go_router)](https://pub.dev/packages/go_router/score) | [![popularity](https://img.shields.io/pub/popularity/go_router)](https://pub.dev/packages/go_router/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20go_router?label=)](https://github.com./flutter/flutter/labels/p%3A%20go_router) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20go_router?label=)](https://github.com./flutter/packages/labels/p%3A%20go_router) |
5656
| [go\_router\_builder](./packages/go_router_builder/) | [![pub package](https://img.shields.io/pub/v/go_router_builder.svg)](https://pub.dev/packages/go_router_builder) | [![pub points](https://img.shields.io/pub/points/go_router_builder)](https://pub.dev/packages/go_router_builder/score) | [![popularity](https://img.shields.io/pub/popularity/go_router_builder)](https://pub.dev/packages/go_router_builder/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20go_router_builder?label=)](https://github.com./flutter/flutter/labels/p%3A%20go_router_builder) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20go_router_builder?label=)](https://github.com./flutter/packages/labels/p%3A%20go_router_builder) |
57+
| [google\_adsense](./packages/google_adsense/)| [![pub package](https://img.shields.io/pub/v/google_adsense.svg)](https://pub.dev/packages/google_adsense) | [![pub points](https://img.shields.io/pub/points/google_adsense)](https://pub.dev/packages/google_adsense/score) | [![popularity](https://img.shields.io/pub/popularity/google_adsense)](https://pub.dev/packages/google_adsense/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20google_adsense?label=)](https://github.com./flutter/flutter/labels/p%3A%20google_adsense) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20google_adsense?label=)](https://github.com./flutter/packages/labels/p%3A%20google_adsense) |
5758
| [google\_maps\_flutter](./packages/google_maps_flutter/) | [![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dev/packages/google_maps_flutter) | [![pub points](https://img.shields.io/pub/points/google_maps_flutter)](https://pub.dev/packages/google_maps_flutter/score) | [![popularity](https://img.shields.io/pub/popularity/google_maps_flutter)](https://pub.dev/packages/google_maps_flutter/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20maps?label=)](https://github.com./flutter/flutter/labels/p%3A%20maps) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20google_maps_flutter?label=)](https://github.com./flutter/packages/labels/p%3A%20google_maps_flutter) |
5859
| [google\_sign\_in](./packages/google_sign_in/) | [![pub package](https://img.shields.io/pub/v/google_sign_in.svg)](https://pub.dev/packages/google_sign_in) | [![pub points](https://img.shields.io/pub/points/google_sign_in)](https://pub.dev/packages/google_sign_in/score) | [![popularity](https://img.shields.io/pub/popularity/google_sign_in)](https://pub.dev/packages/google_sign_in/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20google_sign_in?label=)](https://github.com./flutter/flutter/labels/p%3A%20google_sign_in) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20google_sign_in?label=)](https://github.com./flutter/packages/labels/p%3A%20google_sign_in) |
5960
| [image\_picker](./packages/image_picker/) | [![pub package](https://img.shields.io/pub/v/image_picker.svg)](https://pub.dev/packages/image_picker) | [![pub points](https://img.shields.io/pub/points/image_picker)](https://pub.dev/packages/image_picker/score) | [![popularity](https://img.shields.io/pub/popularity/image_picker)](https://pub.dev/packages/image_picker/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20image_picker?label=)](https://github.com./flutter/flutter/labels/p%3A%20image_picker) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20image_picker?label=)](https://github.com./flutter/packages/labels/p%3A%20image_picker) |

packages/animations/example/ios/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import Flutter
66
import UIKit
77

8-
@UIApplicationMain
8+
@main
99
@objc class AppDelegate: FlutterAppDelegate {
1010
override func application(
1111
_ application: UIApplication,

packages/camera/camera/example/ios/Runner.xcodeproj/project.pbxproj

+23-24
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
236906D1621AE863A5B2E770 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 89D82918721FABF772705DB0 /* libPods-Runner.a */; };
1212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
13+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1314
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1415
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1516
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -58,6 +59,7 @@
5859
isa = PBXFrameworksBuildPhase;
5960
buildActionMask = 2147483647;
6061
files = (
62+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
6163
236906D1621AE863A5B2E770 /* libPods-Runner.a in Frameworks */,
6264
);
6365
runOnlyForDeploymentPostprocessing = 0;
@@ -153,13 +155,15 @@
153155
97C146EC1CF9000F007C117D /* Resources */,
154156
9705A1C41CF9048500538489 /* Embed Frameworks */,
155157
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
156-
8CEC7AD219FB134B511EBA9D /* [CP] Copy Pods Resources */,
157158
);
158159
buildRules = (
159160
);
160161
dependencies = (
161162
);
162163
name = Runner;
164+
packageProductDependencies = (
165+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
166+
);
163167
productName = Runner;
164168
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
165169
productType = "com.apple.product-type.application";
@@ -170,7 +174,7 @@
170174
97C146E61CF9000F007C117D /* Project object */ = {
171175
isa = PBXProject;
172176
attributes = {
173-
LastUpgradeCheck = 1430;
177+
LastUpgradeCheck = 1510;
174178
ORGANIZATIONNAME = "The Flutter Authors";
175179
TargetAttributes = {
176180
97C146ED1CF9000F007C117D = {
@@ -187,6 +191,9 @@
187191
Base,
188192
);
189193
mainGroup = 97C146E51CF9000F007C117D;
194+
packageReferences = (
195+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
196+
);
190197
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
191198
projectDirPath = "";
192199
projectRoot = "";
@@ -227,28 +234,6 @@
227234
shellPath = /bin/sh;
228235
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
229236
};
230-
8CEC7AD219FB134B511EBA9D /* [CP] Copy Pods Resources */ = {
231-
isa = PBXShellScriptBuildPhase;
232-
buildActionMask = 2147483647;
233-
files = (
234-
);
235-
inputPaths = (
236-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
237-
"${PODS_CONFIGURATION_BUILD_DIR}/camera_avfoundation/camera_avfoundation_privacy.bundle",
238-
"${PODS_CONFIGURATION_BUILD_DIR}/path_provider_foundation/path_provider_foundation_privacy.bundle",
239-
"${PODS_CONFIGURATION_BUILD_DIR}/video_player_avfoundation/video_player_avfoundation_privacy.bundle",
240-
);
241-
name = "[CP] Copy Pods Resources";
242-
outputPaths = (
243-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/camera_avfoundation_privacy.bundle",
244-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/path_provider_foundation_privacy.bundle",
245-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/video_player_avfoundation_privacy.bundle",
246-
);
247-
runOnlyForDeploymentPostprocessing = 0;
248-
shellPath = /bin/sh;
249-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
250-
showEnvVarsInLog = 0;
251-
};
252237
9740EEB61CF901F6004384FC /* Run Script */ = {
253238
isa = PBXShellScriptBuildPhase;
254239
alwaysOutOfDate = 1;
@@ -499,6 +484,20 @@
499484
defaultConfigurationName = Release;
500485
};
501486
/* End XCConfigurationList section */
487+
488+
/* Begin XCLocalSwiftPackageReference section */
489+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
490+
isa = XCLocalSwiftPackageReference;
491+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
492+
};
493+
/* End XCLocalSwiftPackageReference section */
494+
495+
/* Begin XCSwiftPackageProductDependency section */
496+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
497+
isa = XCSwiftPackageProductDependency;
498+
productName = FlutterGeneratedPluginSwiftPackage;
499+
};
500+
/* End XCSwiftPackageProductDependency section */
502501
};
503502
rootObject = 97C146E61CF9000F007C117D /* Project object */;
504503
}

packages/camera/camera/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Prepare Flutter Framework Script"
13+
scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
14+
<EnvironmentBuildable>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
18+
BuildableName = "Runner.app"
19+
BlueprintName = "Runner"
20+
ReferencedContainer = "container:Runner.xcodeproj">
21+
</BuildableReference>
22+
</EnvironmentBuildable>
23+
</ActionContent>
24+
</ExecutionAction>
25+
</PreActions>
826
<BuildActionEntries>
927
<BuildActionEntry
1028
buildForTesting = "YES"
@@ -58,6 +76,7 @@
5876
ignoresPersistentStateOnLaunch = "NO"
5977
debugDocumentVersioning = "YES"
6078
debugServiceExtension = "internal"
79+
enableGPUValidationMode = "1"
6180
allowLocationSimulation = "YES">
6281
<BuildableProductRunnable
6382
runnableDebuggingMode = "0">

packages/camera/camera_android/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.10.9+17
2+
3+
* Updates annotations lib to 1.9.1.
4+
15
## 0.10.9+16
26

37
* Updates annotations lib to 1.9.0.

packages/camera/camera_android/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ buildFeatures {
6666
}
6767

6868
dependencies {
69-
implementation 'androidx.annotation:annotation:1.9.0'
69+
implementation 'androidx.annotation:annotation:1.9.1'
7070
testImplementation 'junit:junit:4.13.2'
7171
testImplementation 'org.mockito:mockito-inline:5.0.0'
7272
testImplementation 'androidx.test:core:1.4.0'

packages/camera/camera_android/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
33
repository: https://github.com./flutter/packages/tree/main/packages/camera/camera_android
44
issue_tracker: https://github.com./flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
55

6-
version: 0.10.9+16
6+
version: 0.10.9+17
77

88
environment:
99
sdk: ^3.5.0

0 commit comments

Comments
 (0)