Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 520caa9

Browse files
jmagmanjmagman
committed
[google_maps_flutter] Update and migrate iOS example project
1 parent a3c8e36 commit 520caa9

4 files changed

Lines changed: 22 additions & 30 deletions

File tree

‎packages/google_maps_flutter/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.5.21+5
2+
3+
* Update and migrate iOS example project.
4+
15
## 0.5.21+4
26

37
* Support projection methods to translate between screen and latlng coordinates.

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

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1312
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1413
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1514
4510D964F3B1259FEDD3ABA6 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */; };
1615
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1716
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
18-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
19-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
2017
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2118
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2219
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -42,7 +39,6 @@
4239
/* Begin PBXFileReference section */
4340
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4441
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
45-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4642
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4743
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4844
7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -58,6 +54,8 @@
5854
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5955
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6056
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
57+
B7AFC65E3DD5AC60D834D83D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
58+
EA0E91726245EDC22B97E8B9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
6159
/* End PBXFileReference section */
6260

6361
/* Begin PBXFrameworksBuildPhase section */
@@ -85,7 +83,6 @@
8583
9740EEB11CF90186004384FC /* Flutter */ = {
8684
isa = PBXGroup;
8785
children = (
88-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
8986
3B80C3931E831B6300D905FE /* App.framework */,
9087
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
9188
9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -142,6 +139,8 @@
142139
A189CFE5474BF8A07908B2E0 /* Pods */ = {
143140
isa = PBXGroup;
144141
children = (
142+
B7AFC65E3DD5AC60D834D83D /* Pods-Runner.debug.xcconfig */,
143+
EA0E91726245EDC22B97E8B9 /* Pods-Runner.release.xcconfig */,
145144
);
146145
name = Pods;
147146
sourceTree = "<group>";
@@ -178,7 +177,7 @@
178177
97C146E61CF9000F007C117D /* Project object */ = {
179178
isa = PBXProject;
180179
attributes = {
181-
LastUpgradeCheck = 0910;
180+
LastUpgradeCheck = 1100;
182181
ORGANIZATIONNAME = "The Chromium Authors";
183182
TargetAttributes = {
184183
97C146ED1CF9000F007C117D = {
@@ -188,7 +187,7 @@
188187
};
189188
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
190189
compatibilityVersion = "Xcode 3.2";
191-
developmentRegion = English;
190+
developmentRegion = en;
192191
hasScannedForEncodings = 0;
193192
knownRegions = (
194193
en,
@@ -210,11 +209,8 @@
210209
buildActionMask = 2147483647;
211210
files = (
212211
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
213-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
214212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
215-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
216213
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
217-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
218214
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
219215
);
220216
runOnlyForDeploymentPostprocessing = 0;
@@ -274,16 +270,13 @@
274270
files = (
275271
);
276272
inputPaths = (
277-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
278-
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
279273
);
280274
name = "[CP] Copy Pods Resources";
281275
outputPaths = (
282-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
283276
);
284277
runOnlyForDeploymentPostprocessing = 0;
285278
shellPath = /bin/sh;
286-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
279+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
287280
showEnvVarsInLog = 0;
288281
};
289282
FE7DE34E225BB9A5F4DB58C6 /* [CP] Embed Pods Frameworks */ = {
@@ -292,16 +285,13 @@
292285
files = (
293286
);
294287
inputPaths = (
295-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
296-
"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
297288
);
298289
name = "[CP] Embed Pods Frameworks";
299290
outputPaths = (
300-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
301291
);
302292
runOnlyForDeploymentPostprocessing = 0;
303293
shellPath = /bin/sh;
304-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
294+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
305295
showEnvVarsInLog = 0;
306296
};
307297
/* End PBXShellScriptBuildPhase section */
@@ -344,6 +334,7 @@
344334
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
345335
buildSettings = {
346336
ALWAYS_SEARCH_USER_PATHS = NO;
337+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
347338
CLANG_ANALYZER_NONNULL = YES;
348339
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
349340
CLANG_CXX_LIBRARY = "libc++";
@@ -353,12 +344,14 @@
353344
CLANG_WARN_BOOL_CONVERSION = YES;
354345
CLANG_WARN_COMMA = YES;
355346
CLANG_WARN_CONSTANT_CONVERSION = YES;
347+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
356348
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
357349
CLANG_WARN_EMPTY_BODY = YES;
358350
CLANG_WARN_ENUM_CONVERSION = YES;
359351
CLANG_WARN_INFINITE_RECURSION = YES;
360352
CLANG_WARN_INT_CONVERSION = YES;
361353
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
354+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
362355
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
363356
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
364357
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -398,6 +391,7 @@
398391
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
399392
buildSettings = {
400393
ALWAYS_SEARCH_USER_PATHS = NO;
394+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
401395
CLANG_ANALYZER_NONNULL = YES;
402396
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
403397
CLANG_CXX_LIBRARY = "libc++";
@@ -407,12 +401,14 @@
407401
CLANG_WARN_BOOL_CONVERSION = YES;
408402
CLANG_WARN_COMMA = YES;
409403
CLANG_WARN_CONSTANT_CONVERSION = YES;
404+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
410405
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
411406
CLANG_WARN_EMPTY_BODY = YES;
412407
CLANG_WARN_ENUM_CONVERSION = YES;
413408
CLANG_WARN_INFINITE_RECURSION = YES;
414409
CLANG_WARN_INT_CONVERSION = YES;
415410
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
411+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
416412
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
417413
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
418414
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -445,7 +441,6 @@
445441
isa = XCBuildConfiguration;
446442
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
447443
buildSettings = {
448-
ARCHS = arm64;
449444
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
450445
ENABLE_BITCODE = NO;
451446
FRAMEWORK_SEARCH_PATHS = (
@@ -467,7 +462,6 @@
467462
isa = XCBuildConfiguration;
468463
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
469464
buildSettings = {
470-
ARCHS = arm64;
471465
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
472466
ENABLE_BITCODE = NO;
473467
FRAMEWORK_SEARCH_PATHS = (

‎packages/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,10 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
31-
<Testables>
32-
</Testables>
3330
<MacroExpansion>
3431
<BuildableReference
3532
BuildableIdentifier = "primary"
@@ -39,14 +36,13 @@
3936
ReferencedContainer = "container:Runner.xcodeproj">
4037
</BuildableReference>
4138
</MacroExpansion>
42-
<AdditionalOptions>
43-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4441
</TestAction>
4542
<LaunchAction
4643
buildConfiguration = "Debug"
4744
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4845
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5046
launchStyle = "0"
5147
useCustomWorkingDirectory = "NO"
5248
ignoresPersistentStateOnLaunch = "NO"
@@ -63,8 +59,6 @@
6359
ReferencedContainer = "container:Runner.xcodeproj">
6460
</BuildableReference>
6561
</BuildableProductRunnable>
66-
<AdditionalOptions>
67-
</AdditionalOptions>
6862
</LaunchAction>
6963
<ProfileAction
7064
buildConfiguration = "Release"

‎packages/google_maps_flutter/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_maps_flutter
22
description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
33
author: Flutter Team <flutter-dev@googlegroups.com>
44
homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
5-
version: 0.5.21+4
5+
version: 0.5.21+5
66

77
dependencies:
88
flutter:

0 commit comments

Comments
 (0)