Skip to content

Commit 36e1ac2

Browse files
author
Marina González
committed
Merge branch 'master' into quick_actions_fix
* master: (21 commits) Add versions to all the dependencies so they are pinned (flutter#5887) Roll Flutter from 52c47e9 to 1b2ee41 (8 revisions) (flutter#5916) [various] Clean up obsolete references to "master" (flutter#5912) Re-add tag filter (flutter#5918) [video_player] Android: Rotate videos recorded in landscapeRight (flutter#3820) Revert "Add automatic updating of github-actions (flutter#5880)" (flutter#5917) Add automatic updating of github-actions (flutter#5880) Roll Flutter from 2e1ebd8 to 52c47e9 (9 revisions) (flutter#5911) Roll Flutter from 889a15e to 2e1ebd8 (6 revisions) (flutter#5910) Revert "All the workflows have been migrated to use main. (flutter#5874)" (flutter#5907) Update filter to run tasks only on PRs and main branch. (flutter#5883) [image_picker_android] Add jetifier back with gradle and androidx upgrades (flutter#5890) Roll Flutter from e899573 to 889a15e (176 revisions) (flutter#5905) ignore upcoming warnings in webview_flutter_wkwebview (flutter#5856) ignore upcoming warnings in webview_flutter_platform_interface (flutter#5855) [webview_flutter_wkwebview] Implement one callback method for review of the design (flutter#5700) [image_picker_android] Remove `jetifier` and `enableUnitTestBinaryResources` from gradle properties (flutter#5889) update key (flutter#5882) All the workflows have been migrated to use main. (flutter#5874) [google_maps_flutter] Objective-C code clean up (flutter#5780) ...
2 parents 60e8635 + 395dc14 commit 36e1ac2

File tree

159 files changed

+3062
-2065
lines changed

Some content is hidden

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

159 files changed

+3062
-2065
lines changed

‎.ci.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ platform_properties:
1313
properties:
1414
dependencies: >
1515
[
16-
{"dependency": "curl"}
16+
{"dependency": "curl", "version": "version:7.64.0"}
1717
]
1818
device_type: none
1919
os: Linux
2020
windows:
2121
properties:
2222
dependencies: >
2323
[
24-
{"dependency": "certs"}
24+
{"dependency": "certs", "version": "version:9563bb"}
2525
]
2626
device_type: none
2727
os: Windows
@@ -37,7 +37,7 @@ targets:
3737
version_file: flutter_master.version
3838
dependencies: >
3939
[
40-
{"dependency": "vs_build"}
40+
{"dependency": "vs_build", "version": "version:vs2019"}
4141
]
4242
4343
- name: Windows win32-platform_tests stable
@@ -49,7 +49,7 @@ targets:
4949
channel: stable
5050
dependencies: >
5151
[
52-
{"dependency": "vs_build"}
52+
{"dependency": "vs_build", "version": "version:vs2019"}
5353
]
5454
5555
- name: Windows windows-build_all_plugins master
@@ -62,7 +62,7 @@ targets:
6262
version_file: flutter_master.version
6363
dependencies: >
6464
[
65-
{"dependency": "vs_build"}
65+
{"dependency": "vs_build", "version": "version:vs2019"}
6666
]
6767
6868
- name: Windows windows-build_all_plugins stable
@@ -74,7 +74,7 @@ targets:
7474
channel: stable
7575
dependencies: >
7676
[
77-
{"dependency": "vs_build"}
77+
{"dependency": "vs_build", "version": "version:vs2019"}
7878
]
7979
8080
- name: Windows plugin_tools_tests

‎.ci/flutter_master.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e8995736bf556458db4e908d918b48cae0fa1992
1+
1b2ee411aa1389e74c7c2aada90bc468781532d2

‎.ci/scripts/prepare_tool.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# found in the LICENSE file.
55

66
# To set FETCH_HEAD for "git merge-base" to work
7-
git fetch origin master
7+
git fetch origin main
88

99
cd script/tool
1010
dart pub get

‎.cirrus.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
gcp_credentials: ENCRYPTED[!ebad0a1f4f7a446b77944c33651460a7ab010b4617273cb016cf354eb8fc22aa92e37a3c58bfa4a0c40a799351e027a6!]
22

3-
# Don't run on release tags since it creates O(n^2) tasks where n is the
4-
# number of plugins.
5-
# Don't run on 'master' since it's a mirror of 'main'.
6-
only_if: $CIRRUS_TAG == '' && $CIRRUS_BRANCH != 'master'
3+
# Run on PRs and main branch post submit only. Don't run tests when tagging.
4+
only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'main')
75
env:
86
CHANNEL: "master" # Default to master when not explicitly set by a task.
97
PLUGIN_TOOL: "./script/tool/bin/flutter_plugin_tools.dart"
@@ -88,9 +86,6 @@ task:
8886
- dart pub run test
8987
- name: publishable
9088
env:
91-
# TODO (mvanbeusekom): Temporary override to "stable" because of failure on "master".
92-
# Remove override once https://github.com/dart-lang/pub/issues/3152 is resolved.
93-
CHANNEL: stable
9489
CHANGE_DESC: "$TMPDIR/change-description.txt"
9590
version_check_script:
9691
# For pre-submit, pass the PR description to the script to allow for
@@ -232,7 +227,7 @@ task:
232227
CHANNEL: "master"
233228
CHANNEL: "stable"
234229
MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
235-
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[4c11f1a80a5741d51e92ab609bc7214ab2aa015e68a490e4d6777ebdf84f9c899b97c0ded2f4b2e6adf2c8b5ead1e3c5]
230+
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[c84a06b85f9c906705732aea6142ef6f63ff1a6f07372dc36880a9d0c2c4b9cb35b2e35cd19edc6285167c2a5cc075ec]
236231
build_script:
237232
# Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
238233
# might include non-ASCII characters which makes Gradle crash.

‎.github/PULL_REQUEST_TEMPLATE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
If you need help, consider asking for advice on the #hackers-new channel on [Discord].
2222

2323
<!-- Links -->
24-
[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
24+
[Contributor Guide]: https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md
2525
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
26-
[relevant style guides]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md#style
26+
[relevant style guides]: https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md#style
2727
[CLA]: https://cla.developers.google.com/
2828
[flutter/tests]: https://github.com/flutter/tests
2929
[breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
3030
[Discord]: https://github.com/flutter/flutter/wiki/Chat
3131
[pub versioning philosophy]: https://dart.dev/tools/pub/versioning
3232
[exempt from version changes]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates
3333
[following repository CHANGELOG style]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style
34-
[the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code
34+
[the auto-formatter]: https://github.com/flutter/plugins/blob/main/script/tool/README.md#format-code
3535
[test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing to Flutter Plugins
22

3-
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
3+
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/main)
44

55
_See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_
66

@@ -35,7 +35,7 @@ use, and use auto-formatters:
3535
- [C++](https://google.github.io/styleguide/cppguide.html) formatted with `clang-format`
3636
- **Note**: The Linux plugins generally follow idiomatic GObject-based C
3737
style. See [the engine style
38-
notes](https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style)
38+
notes](https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style)
3939
for more details, and exceptions.
4040
- [Java](https://google.github.io/styleguide/javaguide.html) formatted with
4141
`google-java-format`

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Flutter plugins
22

3-
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
3+
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/main)
44
[![Release Status](https://github.com/flutter/plugins/actions/workflows/release.yml/badge.svg)](https://github.com/flutter/plugins/actions/workflows/release.yml)
55

66
This repo is a companion repo to the main [flutter
@@ -34,7 +34,7 @@ is ready, you can [publish](https://flutter.dev/developing-packages/#publish) it
3434
to the [pub repository](https://pub.dev/).
3535

3636
If you wish to contribute a change to any of the existing plugins in this repo,
37-
please review our [contribution guide](https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md),
37+
please review our [contribution guide](https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md),
3838
and send a [pull request](https://github.com/flutter/plugins/pulls).
3939

4040
## Plugins

‎packages/camera/camera/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ For web integration details, see the
5959

6060
### Handling Lifecycle states
6161

62-
As of version [0.5.0](https://github.com/flutter/plugins/blob/master/packages/camera/CHANGELOG.md#050) of the camera plugin, lifecycle changes are no longer handled by the plugin. This means developers are now responsible to control camera resources when the lifecycle state is updated. Failure to do so might lead to unexpected behavior (for example as described in issue [#39109](https://github.com/flutter/flutter/issues/39109)). Handling lifecycle changes can be done by overriding the `didChangeAppLifecycleState` method like so:
62+
As of version [0.5.0](https://github.com/flutter/plugins/blob/main/packages/camera/CHANGELOG.md#050) of the camera plugin, lifecycle changes are no longer handled by the plugin. This means developers are now responsible to control camera resources when the lifecycle state is updated. Failure to do so might lead to unexpected behavior (for example as described in issue [#39109](https://github.com/flutter/flutter/issues/39109)). Handling lifecycle changes can be done by overriding the `didChangeAppLifecycleState` method like so:
6363

6464
<?code-excerpt "main.dart (AppLifecycle)"?>
6565
```dart

‎packages/camera/camera_web/lib/src/shims/dart_ui_fake.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ import 'dart:html' as html;
1111
// ignore_for_file: camel_case_types
1212

1313
/// Shim for web_ui engine.PlatformViewRegistry
14-
/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L62
14+
/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/ui.dart#L62
1515
class platformViewRegistry {
1616
/// Shim for registerViewFactory
17-
/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L72
17+
/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/ui.dart#L72
1818
static bool registerViewFactory(
1919
String viewTypeId, html.Element Function(int viewId) viewFactory) {
2020
return false;
2121
}
2222
}
2323

2424
/// Shim for web_ui engine.AssetManager.
25-
/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/assets.dart#L12
25+
/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/assets.dart#L12
2626
class webOnlyAssetManager {
2727
/// Shim for getAssetUrl.
28-
/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/assets.dart#L45
28+
/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/assets.dart#L45
2929
static String getAssetUrl(String asset) => '';
3030
}
3131

‎packages/camera/camera_windows/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.1.0+2
2+
3+
* Updates references to the obsolete master branch.
4+
15
## 0.1.0+1
26

37
* Removes unnecessary imports.

‎packages/camera/camera_windows/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: camera_windows
22
description: A Flutter plugin for getting information about and controlling the camera on Windows.
3-
repository: https://github.com/flutter/plugins/tree/master/packages/camera/camera_windows
3+
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_windows
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.1.0+1
5+
version: 0.1.0+2
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

‎packages/e2e/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# e2e (deprecated)
22

3-
This package has been moved to [integration_test](https://github.com/flutter/plugins/tree/master/packages/integration_test).
3+
This package has been moved to [`integration_test` in the Flutter SDK](https://github.com/flutter/flutter/tree/master/packages/integration_test).

‎packages/espresso/android/src/main/java/androidx/test/espresso/flutter/internal/protocol/impl/DartVmService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* An implementation of the Espresso-Flutter testing protocol by using the testing APIs exposed by
4343
* Dart VM service protocol.
4444
*
45-
* @see <a href="https://github.com/dart-lang/sdk/blob/master/runtime/vm/service/service.md">Dart VM
45+
* @see <a href="https://github.com/dart-lang/sdk/blob/main/runtime/vm/service/service.md">Dart VM
4646
* Service Protocol</a>.
4747
*/
4848
public final class DartVmService implements FlutterTestingProtocol {

‎packages/espresso/android/src/main/java/androidx/test/espresso/flutter/internal/protocol/impl/GetVmResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
/**
1717
* Represents a response of a <a
18-
* href="https://github.com/dart-lang/sdk/blob/master/runtime/vm/service/service.md#getvm">getVM()</a>
18+
* href="https://github.com/dart-lang/sdk/blob/main/runtime/vm/service/service.md#getvm">getVM()</a>
1919
* request.
2020
*/
2121
public class GetVmResponse {

‎packages/file_selector/file_selector_macos/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.8.2+2
2+
3+
* Updates references to the obsolete master branch.
4+
15
## 0.8.2+1
26

37
* Removes unnecessary imports.

‎packages/file_selector/file_selector_macos/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: file_selector_macos
22
description: macOS implementation of the file_selector plugin.
3-
repository: https://github.com/flutter/plugins/tree/master/packages/file_selector/file_selector_macos
3+
repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_macos
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
5-
version: 0.8.2+1
5+
version: 0.8.2+2
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

‎packages/file_selector/file_selector_windows/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.8.2+2
2+
3+
* Updates references to the obsolete master branch.
4+
15
## 0.8.2+1
26

37
* Removes unnecessary imports.

‎packages/file_selector/file_selector_windows/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: file_selector_windows
22
description: Windows implementation of the file_selector plugin.
3-
repository: https://github.com/flutter/plugins/tree/master/packages/file_selector/file_selector_windows
3+
repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_windows
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
5-
version: 0.8.2+1
5+
version: 0.8.2+2
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

‎packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.1.7
2+
3+
* Objective-C code cleanup.
4+
15
## 2.1.6
26

37
* Fixes issue in Flutter v3.0.0 where some updates to the map don't take effect on Android.

‎packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj

+8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1212
4510D964F3B1259FEDD3ABA6 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */; };
13+
6851F3562835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m */; };
14+
68E4726A2836FF0C00BDDDAC /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68E472692836FF0C00BDDDAC /* MapKit.framework */; };
1315
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1416
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1517
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -55,6 +57,8 @@
5557
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
5658
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
5759
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
60+
6851F3552835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLTGoogleMapJSONConversionsConversionTests.m; sourceTree = "<group>"; };
61+
68E472692836FF0C00BDDDAC /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk/System/iOSSupport/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; };
5862
733AFAB37683A9DA7512F09C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
5963
7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6064
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -95,6 +99,7 @@
9599
isa = PBXFrameworksBuildPhase;
96100
buildActionMask = 2147483647;
97101
files = (
102+
68E4726A2836FF0C00BDDDAC /* MapKit.framework in Frameworks */,
98103
FC8F35FC8CD533B128950487 /* libPods-RunnerTests.a in Frameworks */,
99104
);
100105
runOnlyForDeploymentPostprocessing = 0;
@@ -112,6 +117,7 @@
112117
1E7CF0857EFC88FC263CF3B2 /* Frameworks */ = {
113118
isa = PBXGroup;
114119
children = (
120+
68E472692836FF0C00BDDDAC /* MapKit.framework */,
115121
7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */,
116122
F267F68029D1A4E2E4C572A7 /* libPods-RunnerTests.a */,
117123
);
@@ -190,6 +196,7 @@
190196
F7151F11265D7ED70028CB91 /* RunnerTests */ = {
191197
isa = PBXGroup;
192198
children = (
199+
6851F3552835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m */,
193200
F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */,
194201
982F2A6A27BADE17003C81F4 /* PartiallyMockedMapView.h */,
195202
982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */,
@@ -446,6 +453,7 @@
446453
buildActionMask = 2147483647;
447454
files = (
448455
F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */,
456+
6851F3562835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m in Sources */,
449457
982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */,
450458
);
451459
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)