Skip to content

Commit 292b5a0

Browse files
auserauser
committed
Pods fix
1 parent c28e8e7 commit 292b5a0

Some content is hidden

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

49 files changed

+1291
-501
lines changed

‎Firestack.podspec‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ Pod::Spec.new do |s|
5050
ss.dependency 'Firebase/RemoteConfig'
5151

5252
s.ios.frameworks = [
53-
'CFNetwork', 'Security',
54-
'SystemConfiguration'
53+
'CFNetwork', 'Security', 'SystemConfiguration'
5554
]
5655
s.ios.libraries = ['icucore', 'c++']
5756
end
@@ -63,11 +62,14 @@ Pod::Spec.new do |s|
6362

6463
s.xcconfig = {
6564
'HEADER_SEARCH_PATHS' => [
66-
"$(inherited)", "${SRCROOT}/../../React/**", "${SRCROOT}/../../node_modules/react-native/**"
65+
"$(inherited)",
66+
"${SRCROOT}/../../React/**",
67+
"${SRCROOT}/../../node_modules/react-native/**"
6768
].join(' '),
6869
'FRAMEWORK_SEARCH_PATHS' => [
6970
"$(inherited)",
7071
"${PODS_ROOT}/Firebase/**",
72+
"${PODS_ROOT}/FirebaseStorage/**",
7173
].join(' '),
7274
'OTHER_LDFLAGS' => '$(inherited) -ObjC'
7375
}

‎ios/Firestack.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10-
990C5C2244881F67F82F4623 /* libPods-Firestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CFBF14844A3A71271E0CE035 /* libPods-Firestack.a */; };
10+
8CCBD6DBFA92784E209B2036 /* libPods-Firestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7A41E090E02D6F58081C8B /* libPods-Firestack.a */; };
1111
D950369E1D19C77400F7094D /* Firestack.m in Sources */ = {isa = PBXBuildFile; fileRef = D950369D1D19C77400F7094D /* Firestack.m */; };
12-
D9FF4BF31D19F5FF00238046 /* libPods-Firestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D95036B81D19C90300F7094D /* libPods-Firestack.a */; settings = {ATTRIBUTES = (Weak, ); }; };
1312
/* End PBXBuildFile section */
1413

1514
/* Begin PBXContainerItemProxy section */
@@ -20,13 +19,6 @@
2019
remoteGlobalIDString = 6A0E8DDC7C16F5507F1B7E4EF54F4E39;
2120
remoteInfo = "Pods-Firestack";
2221
};
23-
D9841C431D4A7E8C00C9BEA8 /* PBXContainerItemProxy */ = {
24-
isa = PBXContainerItemProxy;
25-
containerPortal = D95036B31D19C90300F7094D /* Pods.xcodeproj */;
26-
proxyType = 1;
27-
remoteGlobalIDString = 815EB7527B696DB4C2DE9602F3C0A177;
28-
remoteInfo = "Pods-Firestack";
29-
};
3022
/* End PBXContainerItemProxy section */
3123

3224
/* Begin PBXCopyFilesBuildPhase section */
@@ -43,21 +35,20 @@
4335

4436
/* Begin PBXFileReference section */
4537
134814201AA4EA6300B7C361 /* libFirestack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFirestack.a; sourceTree = BUILT_PRODUCTS_DIR; };
46-
612D3268D15D0E9231997758 /* Pods-Firestack.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestack.release.xcconfig"; path = "Pods/Target Support Files/Pods-Firestack/Pods-Firestack.release.xcconfig"; sourceTree = "<group>"; };
47-
CEE8E427185097CF7EF3A3EB /* Pods-Firestack.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestack.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Firestack/Pods-Firestack.debug.xcconfig"; sourceTree = "<group>"; };
48-
CFBF14844A3A71271E0CE035 /* libPods-Firestack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Firestack.a"; sourceTree = BUILT_PRODUCTS_DIR; };
38+
8E3249A35F073F9BC986D641 /* Pods-Firestack.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestack.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Firestack/Pods-Firestack.debug.xcconfig"; sourceTree = "<group>"; };
39+
BC7A41E090E02D6F58081C8B /* libPods-Firestack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Firestack.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4940
D950369C1D19C77400F7094D /* Firestack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Firestack.h; path = Firestack/Firestack.h; sourceTree = "<group>"; };
5041
D950369D1D19C77400F7094D /* Firestack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Firestack.m; path = Firestack/Firestack.m; sourceTree = "<group>"; };
5142
D95036B31D19C90300F7094D /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = Pods/Pods.xcodeproj; sourceTree = "<group>"; };
43+
E20739D9E57A13C3D42A4876 /* Pods-Firestack.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestack.release.xcconfig"; path = "Pods/Target Support Files/Pods-Firestack/Pods-Firestack.release.xcconfig"; sourceTree = "<group>"; };
5244
/* End PBXFileReference section */
5345

5446
/* Begin PBXFrameworksBuildPhase section */
5547
58B511D81A9E6C8500147676 /* Frameworks */ = {
5648
isa = PBXFrameworksBuildPhase;
5749
buildActionMask = 2147483647;
5850
files = (
59-
D9FF4BF31D19F5FF00238046 /* libPods-Firestack.a in Frameworks */,
60-
990C5C2244881F67F82F4623 /* libPods-Firestack.a in Frameworks */,
51+
8CCBD6DBFA92784E209B2036 /* libPods-Firestack.a in Frameworks */,
6152
);
6253
runOnlyForDeploymentPostprocessing = 0;
6354
};
@@ -72,11 +63,20 @@
7263
name = Products;
7364
sourceTree = "<group>";
7465
};
66+
2ACEF92488EF803A584CD96E /* Pods */ = {
67+
isa = PBXGroup;
68+
children = (
69+
8E3249A35F073F9BC986D641 /* Pods-Firestack.debug.xcconfig */,
70+
E20739D9E57A13C3D42A4876 /* Pods-Firestack.release.xcconfig */,
71+
);
72+
name = Pods;
73+
sourceTree = "<group>";
74+
};
7575
4C361DE13748C14BF1F87624 /* Frameworks */ = {
7676
isa = PBXGroup;
7777
children = (
7878
D95036B31D19C90300F7094D /* Pods.xcodeproj */,
79-
CFBF14844A3A71271E0CE035 /* libPods-Firestack.a */,
79+
BC7A41E090E02D6F58081C8B /* libPods-Firestack.a */,
8080
);
8181
name = Frameworks;
8282
sourceTree = "<group>";
@@ -87,20 +87,11 @@
8787
D950369C1D19C77400F7094D /* Firestack.h */,
8888
D950369D1D19C77400F7094D /* Firestack.m */,
8989
134814211AA4EA7D00B7C361 /* Products */,
90-
6FD8667D22972EC49DB4BE7E /* Pods */,
9190
4C361DE13748C14BF1F87624 /* Frameworks */,
91+
2ACEF92488EF803A584CD96E /* Pods */,
9292
);
9393
sourceTree = "<group>";
9494
};
95-
6FD8667D22972EC49DB4BE7E /* Pods */ = {
96-
isa = PBXGroup;
97-
children = (
98-
CEE8E427185097CF7EF3A3EB /* Pods-Firestack.debug.xcconfig */,
99-
612D3268D15D0E9231997758 /* Pods-Firestack.release.xcconfig */,
100-
);
101-
name = Pods;
102-
sourceTree = "<group>";
103-
};
10495
D95036B41D19C90300F7094D /* Products */ = {
10596
isa = PBXGroup;
10697
children = (
@@ -125,7 +116,6 @@
125116
buildRules = (
126117
);
127118
dependencies = (
128-
D9841C441D4A7E8C00C9BEA8 /* PBXTargetDependency */,
129119
);
130120
name = Firestack;
131121
productName = RCTDataManager;
@@ -223,14 +213,6 @@
223213
};
224214
/* End PBXSourcesBuildPhase section */
225215

226-
/* Begin PBXTargetDependency section */
227-
D9841C441D4A7E8C00C9BEA8 /* PBXTargetDependency */ = {
228-
isa = PBXTargetDependency;
229-
name = "Pods-Firestack";
230-
targetProxy = D9841C431D4A7E8C00C9BEA8 /* PBXContainerItemProxy */;
231-
};
232-
/* End PBXTargetDependency section */
233-
234216
/* Begin XCBuildConfiguration section */
235217
58B511ED1A9E6C8500147676 /* Debug */ = {
236218
isa = XCBuildConfiguration;
@@ -310,7 +292,7 @@
310292
};
311293
58B511F01A9E6C8500147676 /* Debug */ = {
312294
isa = XCBuildConfiguration;
313-
baseConfigurationReference = CEE8E427185097CF7EF3A3EB /* Pods-Firestack.debug.xcconfig */;
295+
baseConfigurationReference = 8E3249A35F073F9BC986D641 /* Pods-Firestack.debug.xcconfig */;
314296
buildSettings = {
315297
DYLIB_INSTALL_NAME_BASE = "";
316298
ENABLE_BITCODE = NO;
@@ -344,7 +326,7 @@
344326
};
345327
58B511F11A9E6C8500147676 /* Release */ = {
346328
isa = XCBuildConfiguration;
347-
baseConfigurationReference = 612D3268D15D0E9231997758 /* Pods-Firestack.release.xcconfig */;
329+
baseConfigurationReference = E20739D9E57A13C3D42A4876 /* Pods-Firestack.release.xcconfig */;
348330
buildSettings = {
349331
DYLIB_INSTALL_NAME_BASE = "";
350332
ENABLE_BITCODE = NO;

‎ios/Firestack/Firestack.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
#import "Firestack.h"
88

9-
@implementation Firestack
10-
119
@import Firebase;
1210

11+
@implementation Firestack
12+
1313
@synthesize bridge = _bridge;
1414

1515
RCT_EXPORT_MODULE(Firestack);

‎ios/Podfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ source 'https://github.com/CocoaPods/Specs.git'
33
platform :ios, '8.0'
44

55
def common_specs
6-
pod 'Firestack', :path => '../'
6+
# pod 'Firestack', :path => '../'
77
# pod 'React', :path => '../node_modules/react-native'
8-
# [
9-
# 'Firebase/Core',
10-
# 'Firebase/Auth',
11-
# 'Firebase/Storage',
12-
# 'Firebase/Database',
13-
# 'Firebase/RemoteConfig'
14-
# ].each do |lib|
15-
# pod lib
16-
# end
8+
[
9+
'Firebase/Core',
10+
'Firebase/Auth',
11+
'Firebase/Storage',
12+
'Firebase/Database',
13+
'Firebase/RemoteConfig'
14+
].each do |lib|
15+
pod lib
16+
end
1717
end
1818

1919
target 'Firestack' do

‎ios/Podfile.lock‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ PODS:
3838
- FirebaseStorage (1.0.2):
3939
- FirebaseAnalytics (~> 3.2)
4040
- GoogleNetworkingUtilities (~> 1.2)
41-
- Firestack (0.0.2):
42-
- Firestack/Core (= 0.0.2)
43-
- Firestack/Core (0.0.2):
44-
- Firebase/Auth
45-
- Firebase/Core
46-
- Firebase/Database
47-
- Firebase/RemoteConfig
48-
- Firebase/Storage
4941
- GoogleInterchangeUtilities (1.2.1):
5042
- GoogleSymbolUtilities (~> 1.0)
5143
- GoogleIPhoneUtilities (1.2.1):
@@ -61,11 +53,11 @@ PODS:
6153
- GoogleSymbolUtilities (~> 1.0)
6254

6355
DEPENDENCIES:
64-
- Firestack (from `../`)
65-
66-
EXTERNAL SOURCES:
67-
Firestack:
68-
:path: "../"
56+
- Firebase/Auth
57+
- Firebase/Core
58+
- Firebase/Database
59+
- Firebase/RemoteConfig
60+
- Firebase/Storage
6961

7062
SPEC CHECKSUMS:
7163
Firebase: 754562547af419cc2f4b15247fee419081924bc2
@@ -75,14 +67,13 @@ SPEC CHECKSUMS:
7567
FirebaseInstanceID: ba1e640935235e5fac39dfa816fe7660e72e1a8a
7668
FirebaseRemoteConfig: c5378e689c1edb54ff62061b8f6a908263dd80ae
7769
FirebaseStorage: fa2a87dee81f682f553af6839daa37a750e65f6a
78-
Firestack: b248e760446e93c68c34dbaa891d1d2f2c0303a5
7970
GoogleInterchangeUtilities: def8415a862effc67d549d5b5b0b9c7a2f97d4de
8071
GoogleIPhoneUtilities: 63f25e93a3ddcb66884d182aab3a660d98f1479b
8172
GoogleNetworkingUtilities: 3e83269048cfb498dc7ec83ab36813360965c74f
8273
GoogleParsingUtilities: 30b3896f9ee167dc78747f013d3de157ced1cadf
8374
GoogleSymbolUtilities: 33117db1b5f290c6fbf259585e4885b4c84b98d7
8475
GoogleUtilities: 56c5ac05b7aa5dc417a1bb85221a9516e04d7032
8576

86-
PODFILE CHECKSUM: 87a05ce87fe0515d14ab781d97524d211aa017f5
77+
PODFILE CHECKSUM: 19dee440fb6a2e26dc0083983be8069f40bcbe4f
8778

8879
COCOAPODS: 1.0.1

‎ios/Pods/FirebaseDatabase/Frameworks/FirebaseDatabase.framework/Headers/FIRDataEventType.h‎

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)