Skip to content

Commit aedf305

Browse files
peteapetea
authored
Clean up sample projects (google#128)
* Delete schemes. * Rename target. * Update Swift package references. * Update target names for pod project. * Add macOS icon. * Use local package for Objc SPM sample. * Add readme files to sample projects. * Update Swift sample readme to be multi-platform.
1 parent 0352614 commit aedf305

10 files changed

Lines changed: 184 additions & 234 deletions

File tree

‎Samples/ObjC/SignInSample/SignInSample.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
/* Begin PBXFileReference section */
2727
C15484C022FCB34100C76691 /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = System/Library/Frameworks/AuthenticationServices.framework; sourceTree = SDKROOT; };
28+
C1B5D386282AFC6B0068D12B /* GoogleSignIn-iOS */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "GoogleSignIn-iOS"; path = ../../..; sourceTree = "<group>"; };
29+
C1B5D38A282AFE000068D12B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
2830
C1E69225264315E7004CE2BC /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
2931
C1E69226264315E7004CE2BC /* SignInViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignInViewController.m; sourceTree = "<group>"; };
3032
C1E69227264315E7004CE2BC /* DataPickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataPickerViewController.h; sourceTree = "<group>"; };
@@ -97,6 +99,14 @@
9799
/* End PBXFrameworksBuildPhase section */
98100

99101
/* Begin PBXGroup section */
102+
C1B5D385282AFC6B0068D12B /* Packages */ = {
103+
isa = PBXGroup;
104+
children = (
105+
C1B5D386282AFC6B0068D12B /* GoogleSignIn-iOS */,
106+
);
107+
name = Packages;
108+
sourceTree = "<group>";
109+
};
100110
C1E69224264315E7004CE2BC /* Source */ = {
101111
isa = PBXGroup;
102112
children = (
@@ -132,6 +142,8 @@
132142
D99924C11A92B3C7008CC226 = {
133143
isa = PBXGroup;
134144
children = (
145+
C1B5D38A282AFE000068D12B /* README.md */,
146+
C1B5D385282AFC6B0068D12B /* Packages */,
135147
C1E6923C2643162E004CE2BC /* SignInSample-Info.plist */,
136148
C1E69224264315E7004CE2BC /* Source */,
137149
C1E6925226431E12004CE2BC /* Resources */,
@@ -503,8 +515,8 @@
503515
isa = XCRemoteSwiftPackageReference;
504516
repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git";
505517
requirement = {
506-
kind = upToNextMajorVersion;
507-
minimumVersion = 6.0.0;
518+
branch = main;
519+
kind = branch;
508520
};
509521
};
510522
/* End XCRemoteSwiftPackageReference section */

‎Samples/ObjC/SignInSample/SignInSampleForPod.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
/* Begin PBXFileReference section */
2727
550F5407FA6F32CFDE2C3C75 /* Pods_SampleForPod.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SampleForPod.framework; sourceTree = BUILT_PRODUCTS_DIR; };
28+
C1B5D38B282AFE460068D12B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
2829
D926A51D1BC31FE000ADECE6 /* SignInSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SignInSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
2930
D926A5371BC3236100ADECE6 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/AppDelegate.h; sourceTree = SOURCE_ROOT; };
3031
D926A5381BC3236100ADECE6 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Source/AppDelegate.m; sourceTree = SOURCE_ROOT; };
@@ -136,6 +137,7 @@
136137
D926A5141BC31FE000ADECE6 = {
137138
isa = PBXGroup;
138139
children = (
140+
C1B5D38B282AFE460068D12B /* README.md */,
139141
D926A56B1BC3236100ADECE6 /* SignInSample-Info.plist */,
140142
C1E6921F26431165004CE2BC /* Source */,
141143
D926A5411BC3236100ADECE6 /* Resources */,

‎Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj‎

Lines changed: 60 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
736F49BC270E102C00580053 /* BirthdayViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736F49BB270E102C00580053 /* BirthdayViewModel.swift */; };
2222
739FCC46270E467600C92042 /* BirthdayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 739FCC45270E467600C92042 /* BirthdayView.swift */; };
2323
739FCC48270E659A00C92042 /* Birthday.swift in Sources */ = {isa = PBXBuildFile; fileRef = 739FCC47270E659A00C92042 /* Birthday.swift */; };
24-
73DB41802805FA0D0028B8D3 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73DB417F2805FA0D0028B8D3 /* GoogleSignIn */; };
25-
73DB41822805FA120028B8D3 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 73DB41812805FA120028B8D3 /* GoogleSignInSwift */; };
26-
73DB41842805FA190028B8D3 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73DB41832805FA190028B8D3 /* GoogleSignIn */; };
27-
73DB41882805FAA70028B8D3 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 73DB41872805FAA70028B8D3 /* GoogleSignInSwift */; };
2824
73DB41892805FBA90028B8D3 /* DaysUntilBirthday.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7345AD022703D9470020AFB1 /* DaysUntilBirthday.swift */; };
2925
73DB418A2805FBC00028B8D3 /* GoogleSignInAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7345AD172703D9C30020AFB1 /* GoogleSignInAuthenticator.swift */; };
3026
73DB418B2805FBC40028B8D3 /* BirthdayLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736F49B9270E05E200580053 /* BirthdayLoader.swift */; };
@@ -38,10 +34,15 @@
3834
73DB41932805FC3B0028B8D3 /* UserProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE7173A527F5110F00910319 /* UserProfileView.swift */; };
3935
73DB41952805FC5F0028B8D3 /* Birthday.swift in Sources */ = {isa = PBXBuildFile; fileRef = 739FCC47270E659A00C92042 /* Birthday.swift */; };
4036
73DB419628060A9A0028B8D3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7345AD062703D9480020AFB1 /* Assets.xcassets */; };
37+
C1B5D37E282AE2B60068D12B /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = C1B5D37D282AE2B60068D12B /* GoogleSignIn */; };
38+
C1B5D380282AE2B60068D12B /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = C1B5D37F282AE2B60068D12B /* GoogleSignInSwift */; };
39+
C1B5D382282AE3370068D12B /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = C1B5D381282AE3370068D12B /* GoogleSignIn */; };
40+
C1B5D384282AE3370068D12B /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = C1B5D383282AE3370068D12B /* GoogleSignInSwift */; };
41+
C1B5D389282AFD3A0068D12B /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = C1B5D388282AFD3A0068D12B /* README.md */; };
4142
/* End PBXBuildFile section */
4243

4344
/* Begin PBXFileReference section */
44-
7345ACFF2703D9470020AFB1 /* DaysUntilBirthday(iOS).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DaysUntilBirthday(iOS).app"; sourceTree = BUILT_PRODUCTS_DIR; };
45+
7345ACFF2703D9470020AFB1 /* DaysUntilBirthday (iOS).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DaysUntilBirthday (iOS).app"; sourceTree = BUILT_PRODUCTS_DIR; };
4546
7345AD022703D9470020AFB1 /* DaysUntilBirthday.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DaysUntilBirthday.swift; sourceTree = "<group>"; };
4647
7345AD042703D9470020AFB1 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
4748
7345AD062703D9480020AFB1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -57,9 +58,10 @@
5758
736F49BB270E102C00580053 /* BirthdayViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BirthdayViewModel.swift; sourceTree = "<group>"; };
5859
739FCC45270E467600C92042 /* BirthdayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BirthdayView.swift; sourceTree = "<group>"; };
5960
739FCC47270E659A00C92042 /* Birthday.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Birthday.swift; sourceTree = "<group>"; };
60-
73DB417E2805F9850028B8D3 /* GoogleSignIn-iOS */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "GoogleSignIn-iOS"; path = ../../..; sourceTree = "<group>"; };
61+
C14E3C0C280788C600CF05A9 /* GoogleSignIn-iOS */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "GoogleSignIn-iOS"; path = ../../..; sourceTree = "<group>"; };
62+
C1B5D388282AFD3A0068D12B /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
6163
FE2F2ABC2800D9C1005EA17F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
62-
FE71738027ECFAF400910319 /* DaysUntilBirthday(macOS).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DaysUntilBirthday(macOS).app"; sourceTree = BUILT_PRODUCTS_DIR; };
64+
FE71738027ECFAF400910319 /* DaysUntilBirthday (macOS).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DaysUntilBirthday (macOS).app"; sourceTree = BUILT_PRODUCTS_DIR; };
6365
FE71738927ECFAF600910319 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
6466
FE71738B27ECFAF600910319 /* DaysUntilBirthdayOnMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DaysUntilBirthdayOnMac.entitlements; sourceTree = "<group>"; };
6567
FE7173A527F5110F00910319 /* UserProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileView.swift; sourceTree = "<group>"; };
@@ -70,17 +72,17 @@
7072
isa = PBXFrameworksBuildPhase;
7173
buildActionMask = 2147483647;
7274
files = (
73-
73DB41802805FA0D0028B8D3 /* GoogleSignIn in Frameworks */,
74-
73DB41822805FA120028B8D3 /* GoogleSignInSwift in Frameworks */,
75+
C1B5D37E282AE2B60068D12B /* GoogleSignIn in Frameworks */,
76+
C1B5D380282AE2B60068D12B /* GoogleSignInSwift in Frameworks */,
7577
);
7678
runOnlyForDeploymentPostprocessing = 0;
7779
};
7880
FE71737D27ECFAF400910319 /* Frameworks */ = {
7981
isa = PBXFrameworksBuildPhase;
8082
buildActionMask = 2147483647;
8183
files = (
82-
73DB41842805FA190028B8D3 /* GoogleSignIn in Frameworks */,
83-
73DB41882805FAA70028B8D3 /* GoogleSignInSwift in Frameworks */,
84+
C1B5D382282AE3370068D12B /* GoogleSignIn in Frameworks */,
85+
C1B5D384282AE3370068D12B /* GoogleSignInSwift in Frameworks */,
8486
);
8587
runOnlyForDeploymentPostprocessing = 0;
8688
};
@@ -90,7 +92,8 @@
9092
7345ACF62703D9470020AFB1 = {
9193
isa = PBXGroup;
9294
children = (
93-
73DB417E2805F9850028B8D3 /* GoogleSignIn-iOS */,
95+
C1B5D388282AFD3A0068D12B /* README.md */,
96+
C14E3C0B280788C600CF05A9 /* Packages */,
9497
7345AD012703D9470020AFB1 /* Shared */,
9598
FE7173A927F656AF00910319 /* iOS */,
9699
FE71738127ECFAF400910319 /* macOS */,
@@ -102,8 +105,8 @@
102105
7345AD002703D9470020AFB1 /* Products */ = {
103106
isa = PBXGroup;
104107
children = (
105-
7345ACFF2703D9470020AFB1 /* DaysUntilBirthday(iOS).app */,
106-
FE71738027ECFAF400910319 /* DaysUntilBirthday(macOS).app */,
108+
7345ACFF2703D9470020AFB1 /* DaysUntilBirthday (iOS).app */,
109+
FE71738027ECFAF400910319 /* DaysUntilBirthday (macOS).app */,
107110
);
108111
name = Products;
109112
sourceTree = "<group>";
@@ -129,6 +132,14 @@
129132
path = "Preview Content";
130133
sourceTree = "<group>";
131134
};
135+
C14E3C0B280788C600CF05A9 /* Packages */ = {
136+
isa = PBXGroup;
137+
children = (
138+
C14E3C0C280788C600CF05A9 /* GoogleSignIn-iOS */,
139+
);
140+
name = Packages;
141+
sourceTree = "<group>";
142+
};
132143
FE71738127ECFAF400910319 /* macOS */ = {
133144
isa = PBXGroup;
134145
children = (
@@ -206,9 +217,9 @@
206217
/* End PBXGroup section */
207218

208219
/* Begin PBXNativeTarget section */
209-
7345ACFE2703D9470020AFB1 /* DaysUntilBirthday(iOS) */ = {
220+
7345ACFE2703D9470020AFB1 /* DaysUntilBirthday (iOS) */ = {
210221
isa = PBXNativeTarget;
211-
buildConfigurationList = 7345AD0E2703D9480020AFB1 /* Build configuration list for PBXNativeTarget "DaysUntilBirthday(iOS)" */;
222+
buildConfigurationList = 7345AD0E2703D9480020AFB1 /* Build configuration list for PBXNativeTarget "DaysUntilBirthday (iOS)" */;
212223
buildPhases = (
213224
7345ACFB2703D9470020AFB1 /* Sources */,
214225
7345ACFC2703D9470020AFB1 /* Frameworks */,
@@ -218,18 +229,18 @@
218229
);
219230
dependencies = (
220231
);
221-
name = "DaysUntilBirthday(iOS)";
232+
name = "DaysUntilBirthday (iOS)";
222233
packageProductDependencies = (
223-
73DB417F2805FA0D0028B8D3 /* GoogleSignIn */,
224-
73DB41812805FA120028B8D3 /* GoogleSignInSwift */,
234+
C1B5D37D282AE2B60068D12B /* GoogleSignIn */,
235+
C1B5D37F282AE2B60068D12B /* GoogleSignInSwift */,
225236
);
226237
productName = "GSI-Swift-Sample";
227-
productReference = 7345ACFF2703D9470020AFB1 /* DaysUntilBirthday(iOS).app */;
238+
productReference = 7345ACFF2703D9470020AFB1 /* DaysUntilBirthday (iOS).app */;
228239
productType = "com.apple.product-type.application";
229240
};
230-
FE71737F27ECFAF400910319 /* DaysUntilBirthday(macOS) */ = {
241+
FE71737F27ECFAF400910319 /* DaysUntilBirthday (macOS) */ = {
231242
isa = PBXNativeTarget;
232-
buildConfigurationList = FE71738C27ECFAF600910319 /* Build configuration list for PBXNativeTarget "DaysUntilBirthday(macOS)" */;
243+
buildConfigurationList = FE71738C27ECFAF600910319 /* Build configuration list for PBXNativeTarget "DaysUntilBirthday (macOS)" */;
233244
buildPhases = (
234245
FE71737C27ECFAF400910319 /* Sources */,
235246
FE71737D27ECFAF400910319 /* Frameworks */,
@@ -239,13 +250,13 @@
239250
);
240251
dependencies = (
241252
);
242-
name = "DaysUntilBirthday(macOS)";
253+
name = "DaysUntilBirthday (macOS)";
243254
packageProductDependencies = (
244-
73DB41832805FA190028B8D3 /* GoogleSignIn */,
245-
73DB41872805FAA70028B8D3 /* GoogleSignInSwift */,
255+
C1B5D381282AE3370068D12B /* GoogleSignIn */,
256+
C1B5D383282AE3370068D12B /* GoogleSignInSwift */,
246257
);
247258
productName = DaysUntilBirthdayOnMac;
248-
productReference = FE71738027ECFAF400910319 /* DaysUntilBirthday(macOS).app */;
259+
productReference = FE71738027ECFAF400910319 /* DaysUntilBirthday (macOS).app */;
249260
productType = "com.apple.product-type.application";
250261
};
251262
/* End PBXNativeTarget section */
@@ -275,13 +286,14 @@
275286
);
276287
mainGroup = 7345ACF62703D9470020AFB1;
277288
packageReferences = (
289+
C1B5D37C282AE2B60068D12B /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
278290
);
279291
productRefGroup = 7345AD002703D9470020AFB1 /* Products */;
280292
projectDirPath = "";
281293
projectRoot = "";
282294
targets = (
283-
7345ACFE2703D9470020AFB1 /* DaysUntilBirthday(iOS) */,
284-
FE71737F27ECFAF400910319 /* DaysUntilBirthday(macOS) */,
295+
7345ACFE2703D9470020AFB1 /* DaysUntilBirthday (iOS) */,
296+
FE71737F27ECFAF400910319 /* DaysUntilBirthday (macOS) */,
285297
);
286298
};
287299
/* End PBXProject section */
@@ -291,6 +303,7 @@
291303
isa = PBXResourcesBuildPhase;
292304
buildActionMask = 2147483647;
293305
files = (
306+
C1B5D389282AFD3A0068D12B /* README.md in Resources */,
294307
7345AD0A2703D9480020AFB1 /* Preview Assets.xcassets in Resources */,
295308
7345AD072703D9480020AFB1 /* Assets.xcassets in Resources */,
296309
);
@@ -580,7 +593,7 @@
580593
defaultConfigurationIsVisible = 0;
581594
defaultConfigurationName = Release;
582595
};
583-
7345AD0E2703D9480020AFB1 /* Build configuration list for PBXNativeTarget "DaysUntilBirthday(iOS)" */ = {
596+
7345AD0E2703D9480020AFB1 /* Build configuration list for PBXNativeTarget "DaysUntilBirthday (iOS)" */ = {
584597
isa = XCConfigurationList;
585598
buildConfigurations = (
586599
7345AD0F2703D9480020AFB1 /* Debug */,
@@ -589,7 +602,7 @@
589602
defaultConfigurationIsVisible = 0;
590603
defaultConfigurationName = Release;
591604
};
592-
FE71738C27ECFAF600910319 /* Build configuration list for PBXNativeTarget "DaysUntilBirthday(macOS)" */ = {
605+
FE71738C27ECFAF600910319 /* Build configuration list for PBXNativeTarget "DaysUntilBirthday (macOS)" */ = {
593606
isa = XCConfigurationList;
594607
buildConfigurations = (
595608
FE71738D27ECFAF600910319 /* Debug */,
@@ -600,20 +613,33 @@
600613
};
601614
/* End XCConfigurationList section */
602615

616+
/* Begin XCRemoteSwiftPackageReference section */
617+
C1B5D37C282AE2B60068D12B /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = {
618+
isa = XCRemoteSwiftPackageReference;
619+
repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git";
620+
requirement = {
621+
branch = main;
622+
kind = branch;
623+
};
624+
};
625+
/* End XCRemoteSwiftPackageReference section */
626+
603627
/* Begin XCSwiftPackageProductDependency section */
604-
73DB417F2805FA0D0028B8D3 /* GoogleSignIn */ = {
628+
C1B5D37D282AE2B60068D12B /* GoogleSignIn */ = {
605629
isa = XCSwiftPackageProductDependency;
630+
package = C1B5D37C282AE2B60068D12B /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
606631
productName = GoogleSignIn;
607632
};
608-
73DB41812805FA120028B8D3 /* GoogleSignInSwift */ = {
633+
C1B5D37F282AE2B60068D12B /* GoogleSignInSwift */ = {
609634
isa = XCSwiftPackageProductDependency;
635+
package = C1B5D37C282AE2B60068D12B /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
610636
productName = GoogleSignInSwift;
611637
};
612-
73DB41832805FA190028B8D3 /* GoogleSignIn */ = {
638+
C1B5D381282AE3370068D12B /* GoogleSignIn */ = {
613639
isa = XCSwiftPackageProductDependency;
614640
productName = GoogleSignIn;
615641
};
616-
73DB41872805FAA70028B8D3 /* GoogleSignInSwift */ = {
642+
C1B5D383282AE3370068D12B /* GoogleSignInSwift */ = {
617643
isa = XCSwiftPackageProductDependency;
618644
productName = GoogleSignInSwift;
619645
};

0 commit comments

Comments
 (0)