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

Commit 01505e1

Browse files
jmagmanjmagman
committed
[google_sign_in] Update and migrate iOS example project
1 parent a2b5a77 commit 01505e1

2 files changed

Lines changed: 29 additions & 29 deletions

File tree

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

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1110
5C6F5A6E1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C6F5A6D1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.m */; };
1211
7A303C2E1E89D76400B1F19E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7A303C2D1E89D76400B1F19E /* GoogleService-Info.plist */; };
1312
7ACDFB091E89442200BE2D00 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7ACDFB081E89442200BE2D00 /* App.framework */; };
1413
7ACDFB0A1E89442200BE2D00 /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7ACDFB081E89442200BE2D00 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1514
7ACDFB0E1E8944C400BE2D00 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7ACDFB0D1E8944C400BE2D00 /* AppFrameworkInfo.plist */; };
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,7 @@
4239

4340
/* Begin PBXFileReference section */
4441
0263E28FA425D1CE928BDE15 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
45-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
42+
5A76713E622F06379AEDEBFA /* 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>"; };
4643
5C6F5A6C1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4744
5C6F5A6D1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4845
7A303C2D1E89D76400B1F19E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -60,6 +57,7 @@
6057
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
6158
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6259
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
60+
F582639B44581540871D9BB0 /* 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>"; };
6361
/* End PBXFileReference section */
6462

6563
/* Begin PBXFrameworksBuildPhase section */
@@ -79,14 +77,15 @@
7977
840012C8B5EDBCF56B0E4AC1 /* Pods */ = {
8078
isa = PBXGroup;
8179
children = (
80+
5A76713E622F06379AEDEBFA /* Pods-Runner.debug.xcconfig */,
81+
F582639B44581540871D9BB0 /* Pods-Runner.release.xcconfig */,
8282
);
8383
name = Pods;
8484
sourceTree = "<group>";
8585
};
8686
9740EEB11CF90186004384FC /* Flutter */ = {
8787
isa = PBXGroup;
8888
children = (
89-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9089
7ACDFB0D1E8944C400BE2D00 /* AppFrameworkInfo.plist */,
9190
7ACDFB081E89442200BE2D00 /* App.framework */,
9291
9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -181,7 +180,7 @@
181180
97C146E61CF9000F007C117D /* Project object */ = {
182181
isa = PBXProject;
183182
attributes = {
184-
LastUpgradeCheck = 0830;
183+
LastUpgradeCheck = 1100;
185184
ORGANIZATIONNAME = "The Chromium Authors";
186185
TargetAttributes = {
187186
97C146ED1CF9000F007C117D = {
@@ -191,7 +190,7 @@
191190
};
192191
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
193192
compatibilityVersion = "Xcode 3.2";
194-
developmentRegion = English;
193+
developmentRegion = en;
195194
hasScannedForEncodings = 0;
196195
knownRegions = (
197196
en,
@@ -212,12 +211,9 @@
212211
isa = PBXResourcesBuildPhase;
213212
buildActionMask = 2147483647;
214213
files = (
215-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
216214
7A303C2E1E89D76400B1F19E /* GoogleService-Info.plist in Resources */,
217215
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
218-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
219216
7ACDFB0E1E8944C400BE2D00 /* AppFrameworkInfo.plist in Resources */,
220-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
221217
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
222218
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
223219
);
@@ -246,18 +242,13 @@
246242
files = (
247243
);
248244
inputPaths = (
249-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
250-
"${PODS_ROOT}/GTMOAuth2/Source/Touch/GTMOAuth2ViewTouch.xib",
251-
"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
252245
);
253246
name = "[CP] Copy Pods Resources";
254247
outputPaths = (
255-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMOAuth2ViewTouch.nib",
256-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
257248
);
258249
runOnlyForDeploymentPostprocessing = 0;
259250
shellPath = /bin/sh;
260-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
251+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
261252
showEnvVarsInLog = 0;
262253
};
263254
95BB15E9E1769C0D146AA592 /* [CP] Embed Pods Frameworks */ = {
@@ -266,16 +257,13 @@
266257
files = (
267258
);
268259
inputPaths = (
269-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
270-
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
271260
);
272261
name = "[CP] Embed Pods Frameworks";
273262
outputPaths = (
274-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
275263
);
276264
runOnlyForDeploymentPostprocessing = 0;
277265
shellPath = /bin/sh;
278-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
266+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
279267
showEnvVarsInLog = 0;
280268
};
281269
9740EEB61CF901F6004384FC /* Run Script */ = {
@@ -350,19 +338,28 @@
350338
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
351339
buildSettings = {
352340
ALWAYS_SEARCH_USER_PATHS = NO;
341+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
353342
CLANG_ANALYZER_NONNULL = YES;
354343
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
355344
CLANG_CXX_LIBRARY = "libc++";
356345
CLANG_ENABLE_MODULES = YES;
357346
CLANG_ENABLE_OBJC_ARC = YES;
347+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
358348
CLANG_WARN_BOOL_CONVERSION = YES;
349+
CLANG_WARN_COMMA = YES;
359350
CLANG_WARN_CONSTANT_CONVERSION = YES;
351+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
360352
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
361353
CLANG_WARN_EMPTY_BODY = YES;
362354
CLANG_WARN_ENUM_CONVERSION = YES;
363355
CLANG_WARN_INFINITE_RECURSION = YES;
364356
CLANG_WARN_INT_CONVERSION = YES;
357+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
358+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
359+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
365360
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
361+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
362+
CLANG_WARN_STRICT_PROTOTYPES = YES;
366363
CLANG_WARN_SUSPICIOUS_MOVE = YES;
367364
CLANG_WARN_UNREACHABLE_CODE = YES;
368365
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -398,19 +395,28 @@
398395
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
399396
buildSettings = {
400397
ALWAYS_SEARCH_USER_PATHS = NO;
398+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
401399
CLANG_ANALYZER_NONNULL = YES;
402400
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
403401
CLANG_CXX_LIBRARY = "libc++";
404402
CLANG_ENABLE_MODULES = YES;
405403
CLANG_ENABLE_OBJC_ARC = YES;
404+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
406405
CLANG_WARN_BOOL_CONVERSION = YES;
406+
CLANG_WARN_COMMA = YES;
407407
CLANG_WARN_CONSTANT_CONVERSION = YES;
408+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
408409
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
409410
CLANG_WARN_EMPTY_BODY = YES;
410411
CLANG_WARN_ENUM_CONVERSION = YES;
411412
CLANG_WARN_INFINITE_RECURSION = YES;
412413
CLANG_WARN_INT_CONVERSION = YES;
414+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
415+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
416+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
413417
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
418+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
419+
CLANG_WARN_STRICT_PROTOTYPES = YES;
414420
CLANG_WARN_SUSPICIOUS_MOVE = YES;
415421
CLANG_WARN_UNREACHABLE_CODE = YES;
416422
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -439,7 +445,6 @@
439445
isa = XCBuildConfiguration;
440446
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
441447
buildSettings = {
442-
ARCHS = arm64;
443448
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
444449
ENABLE_BITCODE = NO;
445450
FRAMEWORK_SEARCH_PATHS = (
@@ -461,7 +466,6 @@
461466
isa = XCBuildConfiguration;
462467
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
463468
buildSettings = {
464-
ARCHS = arm64;
465469
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
466470
ENABLE_BITCODE = NO;
467471
FRAMEWORK_SEARCH_PATHS = (

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

Lines changed: 3 additions & 7 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 = "0830"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:Runner.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:Runner.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

0 commit comments

Comments
 (0)