Skip to content

Commit 588d82b

Browse files
stuartmorgan-gmauricioluz
stuartmorgan-g
authored and
mauricioluz
committed
[google_sign_in] Federate mobile implementations (flutter#5214)
1 parent e48de85 commit 588d82b

File tree

96 files changed

+2539
-266
lines changed

Some content is hidden

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

96 files changed

+2539
-266
lines changed

‎packages/google_sign_in/google_sign_in/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## NEXT
2+
3+
* Moves Android and iOS implementations to federated packages.
4+
15
## 5.2.5
26

37
* Migrates from `ui.hash*` to `Object.hash*`.

‎packages/google_sign_in/google_sign_in/android/settings.gradle

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/google_sign_in/google_sign_in/example/ios/Podfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ flutter_ios_podfile_setup
2929

3030
target 'Runner' do
3131
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
32-
target 'RunnerTests' do
33-
inherit! :search_paths
34-
35-
pod 'OCMock','3.5'
36-
end
3732
end
3833

3934
post_install do |installer|

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

Lines changed: 0 additions & 249 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,8 @@
1616
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1717
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
1818
C2FB9CBA01DB0A2DE5F31E12 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0263E28FA425D1CE928BDE15 /* libPods-Runner.a */; };
19-
C56D3B06A42F3B35C1F47A43 /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18AD6475292B9C45B529DDC9 /* libPods-RunnerTests.a */; };
20-
F76AC1A52666D0540040C8BC /* GoogleSignInTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F76AC1A42666D0540040C8BC /* GoogleSignInTests.m */; };
21-
F76AC1B32666D0610040C8BC /* GoogleSignInUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F76AC1B22666D0610040C8BC /* GoogleSignInUITests.m */; };
2219
/* End PBXBuildFile section */
2320

24-
/* Begin PBXContainerItemProxy section */
25-
F76AC1A72666D0540040C8BC /* PBXContainerItemProxy */ = {
26-
isa = PBXContainerItemProxy;
27-
containerPortal = 97C146E61CF9000F007C117D /* Project object */;
28-
proxyType = 1;
29-
remoteGlobalIDString = 97C146ED1CF9000F007C117D;
30-
remoteInfo = Runner;
31-
};
32-
F76AC1B52666D0610040C8BC /* PBXContainerItemProxy */ = {
33-
isa = PBXContainerItemProxy;
34-
containerPortal = 97C146E61CF9000F007C117D /* Project object */;
35-
proxyType = 1;
36-
remoteGlobalIDString = 97C146ED1CF9000F007C117D;
37-
remoteInfo = Runner;
38-
};
39-
/* End PBXContainerItemProxy section */
40-
4121
/* Begin PBXCopyFilesBuildPhase section */
4222
9705A1C41CF9048500538489 /* Embed Frameworks */ = {
4323
isa = PBXCopyFilesBuildPhase;
@@ -73,12 +53,6 @@
7353
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7454
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7555
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>"; };
76-
F76AC1A22666D0540040C8BC /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
77-
F76AC1A42666D0540040C8BC /* GoogleSignInTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleSignInTests.m; sourceTree = "<group>"; };
78-
F76AC1A62666D0540040C8BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
79-
F76AC1B02666D0610040C8BC /* RunnerUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
80-
F76AC1B22666D0610040C8BC /* GoogleSignInUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleSignInUITests.m; sourceTree = "<group>"; };
81-
F76AC1B42666D0610040C8BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8256
/* End PBXFileReference section */
8357

8458
/* Begin PBXFrameworksBuildPhase section */
@@ -90,21 +64,6 @@
9064
);
9165
runOnlyForDeploymentPostprocessing = 0;
9266
};
93-
F76AC19F2666D0540040C8BC /* Frameworks */ = {
94-
isa = PBXFrameworksBuildPhase;
95-
buildActionMask = 2147483647;
96-
files = (
97-
C56D3B06A42F3B35C1F47A43 /* libPods-RunnerTests.a in Frameworks */,
98-
);
99-
runOnlyForDeploymentPostprocessing = 0;
100-
};
101-
F76AC1AD2666D0610040C8BC /* Frameworks */ = {
102-
isa = PBXFrameworksBuildPhase;
103-
buildActionMask = 2147483647;
104-
files = (
105-
);
106-
runOnlyForDeploymentPostprocessing = 0;
107-
};
10867
/* End PBXFrameworksBuildPhase section */
10968

11069
/* Begin PBXGroup section */
@@ -135,8 +94,6 @@
13594
children = (
13695
9740EEB11CF90186004384FC /* Flutter */,
13796
97C146F01CF9000F007C117D /* Runner */,
138-
F76AC1A32666D0540040C8BC /* RunnerTests */,
139-
F76AC1B12666D0610040C8BC /* RunnerUITests */,
14097
97C146EF1CF9000F007C117D /* Products */,
14198
840012C8B5EDBCF56B0E4AC1 /* Pods */,
14299
CF3B75C9A7D2FA2A4C99F110 /* Frameworks */,
@@ -147,8 +104,6 @@
147104
isa = PBXGroup;
148105
children = (
149106
97C146EE1CF9000F007C117D /* Runner.app */,
150-
F76AC1A22666D0540040C8BC /* RunnerTests.xctest */,
151-
F76AC1B02666D0610040C8BC /* RunnerUITests.xctest */,
152107
);
153108
name = Products;
154109
sourceTree = "<group>";
@@ -187,24 +142,6 @@
187142
name = Frameworks;
188143
sourceTree = "<group>";
189144
};
190-
F76AC1A32666D0540040C8BC /* RunnerTests */ = {
191-
isa = PBXGroup;
192-
children = (
193-
F76AC1A42666D0540040C8BC /* GoogleSignInTests.m */,
194-
F76AC1A62666D0540040C8BC /* Info.plist */,
195-
);
196-
path = RunnerTests;
197-
sourceTree = "<group>";
198-
};
199-
F76AC1B12666D0610040C8BC /* RunnerUITests */ = {
200-
isa = PBXGroup;
201-
children = (
202-
F76AC1B22666D0610040C8BC /* GoogleSignInUITests.m */,
203-
F76AC1B42666D0610040C8BC /* Info.plist */,
204-
);
205-
path = RunnerUITests;
206-
sourceTree = "<group>";
207-
};
208145
/* End PBXGroup section */
209146

210147
/* Begin PBXNativeTarget section */
@@ -230,43 +167,6 @@
230167
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
231168
productType = "com.apple.product-type.application";
232169
};
233-
F76AC1A12666D0540040C8BC /* RunnerTests */ = {
234-
isa = PBXNativeTarget;
235-
buildConfigurationList = F76AC1AB2666D0540040C8BC /* Build configuration list for PBXNativeTarget "RunnerTests" */;
236-
buildPhases = (
237-
27975964E48117AA65B1D6C7 /* [CP] Check Pods Manifest.lock */,
238-
F76AC19E2666D0540040C8BC /* Sources */,
239-
F76AC19F2666D0540040C8BC /* Frameworks */,
240-
F76AC1A02666D0540040C8BC /* Resources */,
241-
);
242-
buildRules = (
243-
);
244-
dependencies = (
245-
F76AC1A82666D0540040C8BC /* PBXTargetDependency */,
246-
);
247-
name = RunnerTests;
248-
productName = RunnerTests;
249-
productReference = F76AC1A22666D0540040C8BC /* RunnerTests.xctest */;
250-
productType = "com.apple.product-type.bundle.unit-test";
251-
};
252-
F76AC1AF2666D0610040C8BC /* RunnerUITests */ = {
253-
isa = PBXNativeTarget;
254-
buildConfigurationList = F76AC1B72666D0610040C8BC /* Build configuration list for PBXNativeTarget "RunnerUITests" */;
255-
buildPhases = (
256-
F76AC1AC2666D0610040C8BC /* Sources */,
257-
F76AC1AD2666D0610040C8BC /* Frameworks */,
258-
F76AC1AE2666D0610040C8BC /* Resources */,
259-
);
260-
buildRules = (
261-
);
262-
dependencies = (
263-
F76AC1B62666D0610040C8BC /* PBXTargetDependency */,
264-
);
265-
name = RunnerUITests;
266-
productName = RunnerUITests;
267-
productReference = F76AC1B02666D0610040C8BC /* RunnerUITests.xctest */;
268-
productType = "com.apple.product-type.bundle.ui-testing";
269-
};
270170
/* End PBXNativeTarget section */
271171

272172
/* Begin PBXProject section */
@@ -279,16 +179,6 @@
279179
97C146ED1CF9000F007C117D = {
280180
CreatedOnToolsVersion = 7.3.1;
281181
};
282-
F76AC1A12666D0540040C8BC = {
283-
CreatedOnToolsVersion = 12.5;
284-
ProvisioningStyle = Automatic;
285-
TestTargetID = 97C146ED1CF9000F007C117D;
286-
};
287-
F76AC1AF2666D0610040C8BC = {
288-
CreatedOnToolsVersion = 12.5;
289-
ProvisioningStyle = Automatic;
290-
TestTargetID = 97C146ED1CF9000F007C117D;
291-
};
292182
};
293183
};
294184
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
@@ -305,8 +195,6 @@
305195
projectRoot = "";
306196
targets = (
307197
97C146ED1CF9000F007C117D /* Runner */,
308-
F76AC1A12666D0540040C8BC /* RunnerTests */,
309-
F76AC1AF2666D0610040C8BC /* RunnerUITests */,
310198
);
311199
};
312200
/* End PBXProject section */
@@ -324,45 +212,9 @@
324212
);
325213
runOnlyForDeploymentPostprocessing = 0;
326214
};
327-
F76AC1A02666D0540040C8BC /* Resources */ = {
328-
isa = PBXResourcesBuildPhase;
329-
buildActionMask = 2147483647;
330-
files = (
331-
);
332-
runOnlyForDeploymentPostprocessing = 0;
333-
};
334-
F76AC1AE2666D0610040C8BC /* Resources */ = {
335-
isa = PBXResourcesBuildPhase;
336-
buildActionMask = 2147483647;
337-
files = (
338-
);
339-
runOnlyForDeploymentPostprocessing = 0;
340-
};
341215
/* End PBXResourcesBuildPhase section */
342216

343217
/* Begin PBXShellScriptBuildPhase section */
344-
27975964E48117AA65B1D6C7 /* [CP] Check Pods Manifest.lock */ = {
345-
isa = PBXShellScriptBuildPhase;
346-
buildActionMask = 2147483647;
347-
files = (
348-
);
349-
inputFileListPaths = (
350-
);
351-
inputPaths = (
352-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
353-
"${PODS_ROOT}/Manifest.lock",
354-
);
355-
name = "[CP] Check Pods Manifest.lock";
356-
outputFileListPaths = (
357-
);
358-
outputPaths = (
359-
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
360-
);
361-
runOnlyForDeploymentPostprocessing = 0;
362-
shellPath = /bin/sh;
363-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
364-
showEnvVarsInLog = 0;
365-
};
366218
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
367219
isa = PBXShellScriptBuildPhase;
368220
buildActionMask = 2147483647;
@@ -440,37 +292,8 @@
440292
);
441293
runOnlyForDeploymentPostprocessing = 0;
442294
};
443-
F76AC19E2666D0540040C8BC /* Sources */ = {
444-
isa = PBXSourcesBuildPhase;
445-
buildActionMask = 2147483647;
446-
files = (
447-
F76AC1A52666D0540040C8BC /* GoogleSignInTests.m in Sources */,
448-
);
449-
runOnlyForDeploymentPostprocessing = 0;
450-
};
451-
F76AC1AC2666D0610040C8BC /* Sources */ = {
452-
isa = PBXSourcesBuildPhase;
453-
buildActionMask = 2147483647;
454-
files = (
455-
F76AC1B32666D0610040C8BC /* GoogleSignInUITests.m in Sources */,
456-
);
457-
runOnlyForDeploymentPostprocessing = 0;
458-
};
459295
/* End PBXSourcesBuildPhase section */
460296

461-
/* Begin PBXTargetDependency section */
462-
F76AC1A82666D0540040C8BC /* PBXTargetDependency */ = {
463-
isa = PBXTargetDependency;
464-
target = 97C146ED1CF9000F007C117D /* Runner */;
465-
targetProxy = F76AC1A72666D0540040C8BC /* PBXContainerItemProxy */;
466-
};
467-
F76AC1B62666D0610040C8BC /* PBXTargetDependency */ = {
468-
isa = PBXTargetDependency;
469-
target = 97C146ED1CF9000F007C117D /* Runner */;
470-
targetProxy = F76AC1B52666D0610040C8BC /* PBXContainerItemProxy */;
471-
};
472-
/* End PBXTargetDependency section */
473-
474297
/* Begin PBXVariantGroup section */
475298
97C146FA1CF9000F007C117D /* Main.storyboard */ = {
476299
isa = PBXVariantGroup;
@@ -641,60 +464,6 @@
641464
};
642465
name = Release;
643466
};
644-
F76AC1A92666D0540040C8BC /* Debug */ = {
645-
isa = XCBuildConfiguration;
646-
baseConfigurationReference = 37E582FF620A90D0EB2C0851 /* Pods-RunnerTests.debug.xcconfig */;
647-
buildSettings = {
648-
BUNDLE_LOADER = "$(TEST_HOST)";
649-
CODE_SIGN_STYLE = Automatic;
650-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
651-
INFOPLIST_FILE = RunnerTests/Info.plist;
652-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
653-
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests;
654-
PRODUCT_NAME = "$(TARGET_NAME)";
655-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
656-
};
657-
name = Debug;
658-
};
659-
F76AC1AA2666D0540040C8BC /* Release */ = {
660-
isa = XCBuildConfiguration;
661-
baseConfigurationReference = 45D93D4513839BFEA2AA74FE /* Pods-RunnerTests.release.xcconfig */;
662-
buildSettings = {
663-
BUNDLE_LOADER = "$(TEST_HOST)";
664-
CODE_SIGN_STYLE = Automatic;
665-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
666-
INFOPLIST_FILE = RunnerTests/Info.plist;
667-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
668-
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests;
669-
PRODUCT_NAME = "$(TARGET_NAME)";
670-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
671-
};
672-
name = Release;
673-
};
674-
F76AC1B82666D0610040C8BC /* Debug */ = {
675-
isa = XCBuildConfiguration;
676-
buildSettings = {
677-
CODE_SIGN_STYLE = Automatic;
678-
INFOPLIST_FILE = RunnerUITests/Info.plist;
679-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
680-
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerUITests;
681-
PRODUCT_NAME = "$(TARGET_NAME)";
682-
TEST_TARGET_NAME = Runner;
683-
};
684-
name = Debug;
685-
};
686-
F76AC1B92666D0610040C8BC /* Release */ = {
687-
isa = XCBuildConfiguration;
688-
buildSettings = {
689-
CODE_SIGN_STYLE = Automatic;
690-
INFOPLIST_FILE = RunnerUITests/Info.plist;
691-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
692-
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerUITests;
693-
PRODUCT_NAME = "$(TARGET_NAME)";
694-
TEST_TARGET_NAME = Runner;
695-
};
696-
name = Release;
697-
};
698467
/* End XCBuildConfiguration section */
699468

700469
/* Begin XCConfigurationList section */
@@ -716,24 +485,6 @@
716485
defaultConfigurationIsVisible = 0;
717486
defaultConfigurationName = Release;
718487
};
719-
F76AC1AB2666D0540040C8BC /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
720-
isa = XCConfigurationList;
721-
buildConfigurations = (
722-
F76AC1A92666D0540040C8BC /* Debug */,
723-
F76AC1AA2666D0540040C8BC /* Release */,
724-
);
725-
defaultConfigurationIsVisible = 0;
726-
defaultConfigurationName = Release;
727-
};
728-
F76AC1B72666D0610040C8BC /* Build configuration list for PBXNativeTarget "RunnerUITests" */ = {
729-
isa = XCConfigurationList;
730-
buildConfigurations = (
731-
F76AC1B82666D0610040C8BC /* Debug */,
732-
F76AC1B92666D0610040C8BC /* Release */,
733-
);
734-
defaultConfigurationIsVisible = 0;
735-
defaultConfigurationName = Release;
736-
};
737488
/* End XCConfigurationList section */
738489
};
739490
rootObject = 97C146E61CF9000F007C117D /* Project object */;

0 commit comments

Comments
 (0)