Skip to content

Commit e33ff0c

Browse files
morganchen12morganchen12
committed
cleanup objc sample pbxproj; bump cocoapods version in travis
1 parent 57380c5 commit e33ff0c

File tree

2 files changed

+2
-78
lines changed

2 files changed

+2
-78
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ xcode_scheme: FirebaseUI
66
rvm: 2.3.1
77
before_install:
88
- gem uninstall cocoapods -a
9-
- gem install cocoapods -v 1.2.0.rc.1
9+
- gem install cocoapods -v 1.2.0
1010
- gem install xcpretty
1111
- pod install --repo-update
1212

1313
script: ./test.sh
14+

‎samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
5F2F1C189D864A38727F2C92 /* libPods-FirebaseUI-demo-objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B0CE5CA21ADC4FA8E4181926 /* libPods-FirebaseUI-demo-objc.a */; };
1110
8D7D5DC11D9D9536006C1857 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */; };
1211
8D7F86B51D9DAA0100C2A122 /* FUIStorageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */; };
1312
C329B1B21DAD6E5100059A13 /* FUICustomEmailEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C329B1B01DAD6E5100059A13 /* FUICustomEmailEntryViewController.m */; };
@@ -39,11 +38,9 @@
3938
/* End PBXBuildFile section */
4039

4140
/* Begin PBXFileReference section */
42-
221D2CD42AC40F65DEDBF3E3 /* Pods-FirebaseUI-demo-objc.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.release.xcconfig"; path = "Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.release.xcconfig"; sourceTree = "<group>"; };
4341
8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
4442
8D7F86B31D9DAA0100C2A122 /* FUIStorageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FUIStorageViewController.h; path = Storage/FUIStorageViewController.h; sourceTree = "<group>"; };
4543
8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FUIStorageViewController.m; path = Storage/FUIStorageViewController.m; sourceTree = "<group>"; };
46-
B0CE5CA21ADC4FA8E4181926 /* libPods-FirebaseUI-demo-objc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FirebaseUI-demo-objc.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4744
C329B1AF1DAD6E5100059A13 /* FUICustomEmailEntryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUICustomEmailEntryViewController.h; sourceTree = "<group>"; };
4845
C329B1B01DAD6E5100059A13 /* FUICustomEmailEntryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUICustomEmailEntryViewController.m; sourceTree = "<group>"; };
4946
C329B1B11DAD6E5100059A13 /* FUICustomEmailEntryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUICustomEmailEntryViewController.xib; sourceTree = "<group>"; };
@@ -79,7 +76,6 @@
7976
C3AC67651D82002F00FC956D /* FUISample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUISample.m; sourceTree = "<group>"; };
8077
C3F23ECE1D80F5890020509F /* FUISamplesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUISamplesViewController.h; sourceTree = "<group>"; };
8178
C3F23ECF1D80F58A0020509F /* FUISamplesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUISamplesViewController.m; sourceTree = "<group>"; };
82-
D51EFD3F6922FA855D23087D /* Pods-FirebaseUI-demo-objc.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.debug.xcconfig"; sourceTree = "<group>"; };
8379
D81A05F01B86A78700498183 /* FirebaseUI-demo-objc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FirebaseUI-demo-objc.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8480
D81A05F41B86A78700498183 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8581
D81A05F51B86A78700498183 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -95,7 +91,6 @@
9591
isa = PBXFrameworksBuildPhase;
9692
buildActionMask = 2147483647;
9793
files = (
98-
5F2F1C189D864A38727F2C92 /* libPods-FirebaseUI-demo-objc.a in Frameworks */,
9994
);
10095
runOnlyForDeploymentPostprocessing = 0;
10196
};
@@ -111,14 +106,6 @@
111106
name = Storage;
112107
sourceTree = "<group>";
113108
};
114-
B052761E5FE212FFCF193F2A /* Frameworks */ = {
115-
isa = PBXGroup;
116-
children = (
117-
B0CE5CA21ADC4FA8E4181926 /* libPods-FirebaseUI-demo-objc.a */,
118-
);
119-
name = Frameworks;
120-
sourceTree = "<group>";
121-
};
122109
C3AC67501D81FE6B00FC956D /* Samples */ = {
123110
isa = PBXGroup;
124111
children = (
@@ -180,8 +167,6 @@
180167
8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */,
181168
D81A05F21B86A78700498183 /* FirebaseUI-demo-objc */,
182169
D81A05F11B86A78700498183 /* Products */,
183-
E058F91CFF44511E1609B856 /* Pods */,
184-
B052761E5FE212FFCF193F2A /* Frameworks */,
185170
);
186171
sourceTree = "<group>";
187172
};
@@ -220,28 +205,16 @@
220205
name = "Supporting Files";
221206
sourceTree = "<group>";
222207
};
223-
E058F91CFF44511E1609B856 /* Pods */ = {
224-
isa = PBXGroup;
225-
children = (
226-
D51EFD3F6922FA855D23087D /* Pods-FirebaseUI-demo-objc.debug.xcconfig */,
227-
221D2CD42AC40F65DEDBF3E3 /* Pods-FirebaseUI-demo-objc.release.xcconfig */,
228-
);
229-
name = Pods;
230-
sourceTree = "<group>";
231-
};
232208
/* End PBXGroup section */
233209

234210
/* Begin PBXNativeTarget section */
235211
D81A05EF1B86A78700498183 /* FirebaseUI-demo-objc */ = {
236212
isa = PBXNativeTarget;
237213
buildConfigurationList = D81A06131B86A78700498183 /* Build configuration list for PBXNativeTarget "FirebaseUI-demo-objc" */;
238214
buildPhases = (
239-
971DBDCA7DEC7A095BF0A32F /* [CP] Check Pods Manifest.lock */,
240215
D81A05EC1B86A78700498183 /* Sources */,
241216
D81A05ED1B86A78700498183 /* Frameworks */,
242217
D81A05EE1B86A78700498183 /* Resources */,
243-
713BE7250A2AC513A077023C /* [CP] Embed Pods Frameworks */,
244-
E2C1BB9A153F3FE5302D262B /* [CP] Copy Pods Resources */,
245218
);
246219
buildRules = (
247220
);
@@ -305,54 +278,6 @@
305278
};
306279
/* End PBXResourcesBuildPhase section */
307280

308-
/* Begin PBXShellScriptBuildPhase section */
309-
713BE7250A2AC513A077023C /* [CP] Embed Pods Frameworks */ = {
310-
isa = PBXShellScriptBuildPhase;
311-
buildActionMask = 2147483647;
312-
files = (
313-
);
314-
inputPaths = (
315-
);
316-
name = "[CP] Embed Pods Frameworks";
317-
outputPaths = (
318-
);
319-
runOnlyForDeploymentPostprocessing = 0;
320-
shellPath = /bin/sh;
321-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh\"\n";
322-
showEnvVarsInLog = 0;
323-
};
324-
971DBDCA7DEC7A095BF0A32F /* [CP] Check Pods Manifest.lock */ = {
325-
isa = PBXShellScriptBuildPhase;
326-
buildActionMask = 2147483647;
327-
files = (
328-
);
329-
inputPaths = (
330-
);
331-
name = "[CP] Check Pods Manifest.lock";
332-
outputPaths = (
333-
);
334-
runOnlyForDeploymentPostprocessing = 0;
335-
shellPath = /bin/sh;
336-
shellScript = "diff \"${PODS_ROOT}/../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";
337-
showEnvVarsInLog = 0;
338-
};
339-
E2C1BB9A153F3FE5302D262B /* [CP] Copy Pods Resources */ = {
340-
isa = PBXShellScriptBuildPhase;
341-
buildActionMask = 2147483647;
342-
files = (
343-
);
344-
inputPaths = (
345-
);
346-
name = "[CP] Copy Pods Resources";
347-
outputPaths = (
348-
);
349-
runOnlyForDeploymentPostprocessing = 0;
350-
shellPath = /bin/sh;
351-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh\"\n";
352-
showEnvVarsInLog = 0;
353-
};
354-
/* End PBXShellScriptBuildPhase section */
355-
356281
/* Begin PBXSourcesBuildPhase section */
357282
D81A05EC1B86A78700498183 /* Sources */ = {
358283
isa = PBXSourcesBuildPhase;
@@ -483,7 +408,6 @@
483408
};
484409
D81A06141B86A78700498183 /* Debug */ = {
485410
isa = XCBuildConfiguration;
486-
baseConfigurationReference = D51EFD3F6922FA855D23087D /* Pods-FirebaseUI-demo-objc.debug.xcconfig */;
487411
buildSettings = {
488412
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
489413
INFOPLIST_FILE = "FirebaseUI-demo-objc/Info.plist";
@@ -497,7 +421,6 @@
497421
};
498422
D81A06151B86A78700498183 /* Release */ = {
499423
isa = XCBuildConfiguration;
500-
baseConfigurationReference = 221D2CD42AC40F65DEDBF3E3 /* Pods-FirebaseUI-demo-objc.release.xcconfig */;
501424
buildSettings = {
502425
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
503426
INFOPLIST_FILE = "FirebaseUI-demo-objc/Info.plist";

0 commit comments

Comments
 (0)