Skip to content

Commit 8a7fa3c

Browse files
auserauser
committed
Updated with client-side pods
1 parent 40c868a commit 8a7fa3c

15 files changed

+128
-86
lines changed

‎ios/Firestack.xcodeproj/project.pbxproj

Lines changed: 6 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@
121121
isa = PBXNativeTarget;
122122
buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "Firestack" */;
123123
buildPhases = (
124-
48AA3DACF902ED2473601A8C /* [CP] Check Pods Manifest.lock */,
125124
58B511D71A9E6C8500147676 /* Sources */,
126125
58B511D81A9E6C8500147676 /* Frameworks */,
127126
58B511D91A9E6C8500147676 /* CopyFiles */,
128-
6A34E35DF50BEC97B74FC183 /* [CP] Copy Pods Resources */,
129127
);
130128
buildRules = (
131129
);
@@ -167,39 +165,6 @@
167165
};
168166
/* End PBXProject section */
169167

170-
/* Begin PBXShellScriptBuildPhase section */
171-
48AA3DACF902ED2473601A8C /* [CP] Check Pods Manifest.lock */ = {
172-
isa = PBXShellScriptBuildPhase;
173-
buildActionMask = 2147483647;
174-
files = (
175-
);
176-
inputPaths = (
177-
);
178-
name = "[CP] Check Pods Manifest.lock";
179-
outputPaths = (
180-
);
181-
runOnlyForDeploymentPostprocessing = 0;
182-
shellPath = /bin/sh;
183-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
184-
showEnvVarsInLog = 0;
185-
};
186-
6A34E35DF50BEC97B74FC183 /* [CP] Copy Pods Resources */ = {
187-
isa = PBXShellScriptBuildPhase;
188-
buildActionMask = 2147483647;
189-
files = (
190-
);
191-
inputPaths = (
192-
);
193-
name = "[CP] Copy Pods Resources";
194-
outputPaths = (
195-
);
196-
runOnlyForDeploymentPostprocessing = 0;
197-
shellPath = /bin/sh;
198-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Firestack/Pods-Firestack-resources.sh\"\n";
199-
showEnvVarsInLog = 0;
200-
};
201-
/* End PBXShellScriptBuildPhase section */
202-
203168
/* Begin PBXSourcesBuildPhase section */
204169
58B511D71A9E6C8500147676 /* Sources */ = {
205170
isa = PBXSourcesBuildPhase;
@@ -303,27 +268,15 @@
303268
ENABLE_BITCODE = NO;
304269
FRAMEWORK_SEARCH_PATHS = (
305270
"$(inherited)",
306-
"$(PROJECT_DIR)/Pods/FirebaseAnalytics/Frameworks",
307-
"$(PROJECT_DIR)/Pods/FirebaseAuth/Frameworks",
308-
"$(PROJECT_DIR)/Pods/FirebaseDatabase/Frameworks",
309-
"$(PROJECT_DIR)/Pods/FirebaseStorage/Frameworks",
310-
"$(PROJECT_DIR)/Pods/FirebaseInstanceID/Frameworks",
311-
"$(PROJECT_DIR)/Pods/GoogleInterchangeUtilities/Frameworks",
312-
"$(PROJECT_DIR)/Pods/GoogleIPhoneUtilities/Frameworks",
313-
"$(PROJECT_DIR)/Pods/GoogleNetworkingUtilities/Frameworks",
314-
"$(PROJECT_DIR)/Pods/GoogleSymbolUtilities/Frameworks",
315-
"$(PROJECT_DIR)/Pods/GoogleUtilities/Frameworks",
316-
"$(PROJECT_DIR)/Pods/FirebaseAnalytics/Frameworks/frameworks",
317-
"$(PROJECT_DIR)/Pods/FirebaseAuth/Frameworks/frameworks",
318-
"$(PROJECT_DIR)/Pods/FirebaseInstanceID/Frameworks/frameworks",
319-
"$(PROJECT_DIR)/Pods/FirebaseRemoteConfig/Frameworks/frameworks",
320-
"$(PROJECT_DIR)/Pods/FirebaseMessaging/Frameworks/frameworks",
271+
"${BUILT_PRODUCTS_DIR}",
272+
"${PROJECT_DIR}/../../../ios/Pods",
321273
);
322274
HEADER_SEARCH_PATHS = (
323275
"$(inherited)",
324276
"$(SRCROOT)/../../React/**",
325277
"$(SRCROOT)/../../node_modules/react-native/React/**",
326278
"$(SRCROOT)/../../react-native/React/**",
279+
"${PROJECT_DIR}/../../../ios/Pods/**",
327280
);
328281
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
329282
LD_DYLIB_INSTALL_NAME = "@rpath/${EXECUTABLE_NAME}";
@@ -350,27 +303,15 @@
350303
ENABLE_BITCODE = NO;
351304
FRAMEWORK_SEARCH_PATHS = (
352305
"$(inherited)",
353-
"$(PROJECT_DIR)/Pods/FirebaseAnalytics/Frameworks",
354-
"$(PROJECT_DIR)/Pods/FirebaseAuth/Frameworks",
355-
"$(PROJECT_DIR)/Pods/FirebaseDatabase/Frameworks",
356-
"$(PROJECT_DIR)/Pods/FirebaseStorage/Frameworks",
357-
"$(PROJECT_DIR)/Pods/FirebaseInstanceID/Frameworks",
358-
"$(PROJECT_DIR)/Pods/GoogleInterchangeUtilities/Frameworks",
359-
"$(PROJECT_DIR)/Pods/GoogleIPhoneUtilities/Frameworks",
360-
"$(PROJECT_DIR)/Pods/GoogleNetworkingUtilities/Frameworks",
361-
"$(PROJECT_DIR)/Pods/GoogleSymbolUtilities/Frameworks",
362-
"$(PROJECT_DIR)/Pods/GoogleUtilities/Frameworks",
363-
"$(PROJECT_DIR)/Pods/FirebaseAnalytics/Frameworks/frameworks",
364-
"$(PROJECT_DIR)/Pods/FirebaseAuth/Frameworks/frameworks",
365-
"$(PROJECT_DIR)/Pods/FirebaseInstanceID/Frameworks/frameworks",
366-
"$(PROJECT_DIR)/Pods/FirebaseRemoteConfig/Frameworks/frameworks",
367-
"$(PROJECT_DIR)/Pods/FirebaseMessaging/Frameworks/frameworks",
306+
"${BUILT_PRODUCTS_DIR}",
307+
"${PROJECT_DIR}/../../../ios/Pods",
368308
);
369309
HEADER_SEARCH_PATHS = (
370310
"$(inherited)",
371311
"$(SRCROOT)/../../React/**",
372312
"$(SRCROOT)/../../node_modules/react-native/React/**",
373313
"$(SRCROOT)/../../react-native/React/**",
314+
"${PROJECT_DIR}/../../../ios/Pods/**",
374315
);
375316
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
376317
LD_DYLIB_INSTALL_NAME = "@rpath/${EXECUTABLE_NAME}";

‎ios/Firestack/Firestack.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// Copyright © 2016 Facebook. All rights reserved.
55
//
66

7+
#ifndef Firestack_h
8+
#define Firestack_h
9+
710
#import <UIKit/UIKit.h>
811
#import "RCTBridgeModule.h"
912
#import "RCTEventDispatcher.h"
@@ -31,3 +34,5 @@ withLaunchOptions: (NSDictionary *) launchOptions;
3134
@property (nonatomic, strong) NSDictionary *configuration;
3235

3336
@end
37+
38+
#endif

‎ios/Firestack/FirestackAnalytics.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
// Copyright © 2016 Facebook. All rights reserved.
77
//
88

9+
#ifndef FirestackAnalytics_h
10+
#define FirestackAnalytics_h
11+
12+
#import "FirebaseAnalytics.h"
913
#import "RCTBridgeModule.h"
1014

1115
@interface FirestackAnalytics : NSObject <RCTBridgeModule> {
1216

1317
}
1418

1519
@end
20+
21+
#endif

‎ios/Firestack/FirestackAnalytics.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#import "FirestackEvents.h"
1111
#import "FirestackAnalytics.h"
1212

13-
@import FirebaseAnalytics;
14-
1513
@implementation FirestackAnalytics
1614

1715
- (void)dealloc

‎ios/Firestack/FirestackAuth.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
// Copyright © 2016 Facebook. All rights reserved.
77
//
88

9+
#ifndef FirestackAuth_h
10+
#define FirestackAuth_h
11+
912
#import "Firebase.h"
1013
#import "RCTEventEmitter.h"
1114
#import "RCTBridgeModule.h"
@@ -15,3 +18,5 @@
1518
}
1619

1720
@end
21+
22+
#endif

‎ios/Firestack/FirestackCloudMessaging.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,21 @@
66
// Copyright © 2016 Facebook. All rights reserved.
77
//
88

9+
#ifndef FirestackCloudMessaging_h
10+
#define FirestackCloudMessaging_h
11+
912
#import "Firebase.h"
13+
#import "FirebaseMessaging.h"
1014
#import "RCTEventEmitter.h"
1115
#import "RCTBridgeModule.h"
1216
#import "RCTUtils.h"
1317

14-
@import FirebaseMessaging;
15-
1618
@interface FirestackCloudMessaging : RCTEventEmitter <RCTBridgeModule> {
1719

1820
}
1921

2022
+ (void) setup:(UIApplication *)application;
2123

2224
@end
25+
26+
#endif

‎ios/Firestack/FirestackCloudMessaging.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88

99
#import <Foundation/Foundation.h>
1010
#import <NotificationCenter/NotificationCenter.h>
11-
#import "FirestackCloudMessaging.h"
1211
#import "FirestackEvents.h"
1312
#import "RCTConvert.h"
14-
15-
@import FirebaseInstanceID;
16-
@import FirebaseMessaging;
13+
#import "FirestackCloudMessaging.h"
1714

1815
// https://github.com/facebook/react-native/blob/master/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
1916
@implementation RCTConvert (UILocalNotification)

‎ios/Firestack/FirestackDatabase.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,21 @@
66
// Copyright © 2016 Facebook. All rights reserved.
77
//
88

9+
#ifndef FirestackDatabase_h
10+
#define FirestackDatabase_h
11+
912
#import "Firebase.h"
13+
#import "FirebaseDatabase.h"
1014
#import "RCTEventEmitter.h"
1115
#import "RCTBridgeModule.h"
1216

13-
@import FirebaseDatabase;
14-
1517
@interface FirestackDatabase : RCTEventEmitter <RCTBridgeModule> {
1618

1719
}
1820

1921
@property (nonatomic) NSDictionary *_DBHandles;
2022
@property (nonatomic, weak) FIRDatabaseReference *ref;
2123

22-
@end
24+
@end
25+
26+
#endif

‎ios/Firestack/FirestackDatabase.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#import "FirestackDatabase.h"
1111
#import "FirestackEvents.h"
1212

13-
@import FirebaseDatabase;
14-
1513
@interface FirestackDBReference : NSObject
1614
@property NSString *path;
1715
@property NSDictionary *listeners;

‎ios/Firestack/FirestackErrors.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
// Copyright © 2016 Facebook. All rights reserved.
77
//
88

9-
#import "RCTBridgeModule.h"
9+
#ifndef FirestackErrors_h
10+
#define FirestackErrors_h
1011

11-
@import Firebase;
12-
@import FirebaseAuth;
12+
#import "RCTBridgeModule.h"
13+
#import "Firebase.h"
14+
#import "FirebaseAuth.h"
1315

1416
@interface FirestackErrors : NSObject <RCTBridgeModule> {
1517

@@ -22,3 +24,5 @@
2224
error:(NSError *) error
2325
withUser:(FIRUser *) user;
2426
@end
27+
28+
#endif

0 commit comments

Comments
 (0)