Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit 12ed232

Browse files
nlutsenkonlutsenko
committed
Merge pull request #181 from ParsePlatform/nlutsenko.cocoapods
Unignore Podfile.lock and update CocoaPods.
2 parents da89cc2 + 597ce89 commit 12ed232

File tree

5 files changed

+142
-4
lines changed

5 files changed

+142
-4
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
*.xcuserdatad
1414

1515
Pods
16-
Podfile.lock
1716

1817
DerivedData
1918
build
2019

21-
PFResources.*
2220
ParseUI.xcworkspace

‎ParseUI.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10-
0F487952B83BF80EF1A5C4C4 /* Pods_ParseUIDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B11BDB9C48788D891789AC4D /* Pods_ParseUIDemo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
11-
3082A3CE396F45707D6A7F38 /* Pods_ParseUIDemo_Swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A00130E2D30BC9B48B6FC033 /* Pods_ParseUIDemo_Swift.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
10+
0F487952B83BF80EF1A5C4C4 /* Pods_ParseUIDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B11BDB9C48788D891789AC4D /* Pods_ParseUIDemo.framework */; };
11+
3082A3CE396F45707D6A7F38 /* Pods_ParseUIDemo_Swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A00130E2D30BC9B48B6FC033 /* Pods_ParseUIDemo_Swift.framework */; };
1212
8129E5F51A9CB067006752BC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 81472FA71A1AB37500FD6EED /* Images.xcassets */; };
1313
8129E5F71A9CB067006752BC /* 0.png in Resources */ = {isa = PBXBuildFile; fileRef = 81472FA91A1AB37500FD6EED /* 0.png */; };
1414
8129E5F81A9CB067006752BC /* 1.png in Resources */ = {isa = PBXBuildFile; fileRef = 81472FAA1A1AB37500FD6EED /* 1.png */; };

‎ParseUI/Generated/PFResources.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// This is an auto-generated file.
2+
#import <Foundation/Foundation.h>
3+
@interface PFResources : NSObject
4+
+ (NSData *)facebook_icon_png;//modified:2015-10-08 12:36:36 -0700
5+
+ (NSData *)facebook_icon2x_png;//modified:2015-10-08 12:36:36 -0700
6+
+ (NSData *)facebook_icon3x_png;//modified:2015-10-08 12:36:36 -0700
7+
+ (NSData *)parse_logo_png;//modified:2015-10-08 12:36:36 -0700
8+
+ (NSData *)parse_logo2x_png;//modified:2015-10-08 12:36:36 -0700
9+
+ (NSData *)parse_logo3x_png;//modified:2015-10-08 12:36:36 -0700
10+
+ (NSData *)twitter_icon_png;//modified:2015-10-08 12:36:36 -0700
11+
+ (NSData *)twitter_icon2x_png;//modified:2015-10-08 12:36:36 -0700
12+
+ (NSData *)twitter_icon3x_png;//modified:2015-10-08 12:36:36 -0700
13+
@end

‎ParseUI/Generated/PFResources.m‎

Lines changed: 76 additions & 0 deletions
Large diffs are not rendered by default.

‎Podfile.lock‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
PODS:
2+
- Bolts (1.3.0):
3+
- Bolts/AppLinks (= 1.3.0)
4+
- Bolts/Tasks (= 1.3.0)
5+
- Bolts/AppLinks (1.3.0):
6+
- Bolts/Tasks
7+
- Bolts/Tasks (1.3.0)
8+
- FBSDKCoreKit (4.7.0):
9+
- Bolts (~> 1.1)
10+
- FBSDKCoreKit/arc (= 4.7.0)
11+
- FBSDKCoreKit/no-arc (= 4.7.0)
12+
- FBSDKCoreKit/arc (4.7.0):
13+
- Bolts (~> 1.1)
14+
- FBSDKCoreKit/no-arc (4.7.0):
15+
- Bolts (~> 1.1)
16+
- FBSDKCoreKit/arc
17+
- FBSDKLoginKit (4.7.0.1):
18+
- FBSDKCoreKit
19+
- Parse (1.9.0):
20+
- Bolts/Tasks (>= 1.3.0)
21+
- ParseFacebookUtilsV4 (1.9.0):
22+
- Bolts/Tasks (>= 1.3.0)
23+
- FBSDKCoreKit (~> 4.7)
24+
- FBSDKLoginKit (~> 4.7)
25+
- Parse (~> 1.9)
26+
- ParseTwitterUtils (1.9.0):
27+
- Bolts/Tasks (>= 1.3.0)
28+
- Parse (~> 1.9)
29+
- ParseUI (1.1.6):
30+
- Bolts/Tasks (~> 1.2)
31+
- Parse (~> 1.8)
32+
33+
DEPENDENCIES:
34+
- ParseFacebookUtilsV4
35+
- ParseTwitterUtils
36+
- ParseUI (from `.`)
37+
38+
EXTERNAL SOURCES:
39+
ParseUI:
40+
:path: "."
41+
42+
SPEC CHECKSUMS:
43+
Bolts: 805a4a87413e49d4a0c2b7d469084cbc46b09342
44+
FBSDKCoreKit: eb580bfc2040ad44f4c0b4f4d0befb1d35bce59c
45+
FBSDKLoginKit: 028c5a205990441123764609fe795e65027c447f
46+
Parse: 712efbc476d4f47b0f96b70db7e53101575753aa
47+
ParseFacebookUtilsV4: aadebfaaaf4a45bf0a0992863bf48c8fc49189e3
48+
ParseTwitterUtils: 0155d1a4e388690aa5d80405a586474e66606968
49+
ParseUI: 8a22e448c03f825203d8c379c80523517f68baa3
50+
51+
COCOAPODS: 0.39.0

0 commit comments

Comments
 (0)