Skip to content

Commit bc8793b

Browse files
committed
Removed AppDelegate for the time being and export a module
1 parent 18946d1 commit bc8793b

File tree

9 files changed

+219
-239
lines changed

9 files changed

+219
-239
lines changed

ios/Firestack.xcodeproj/project.pbxproj

+8-14
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
D97261C51D551BF0000F703F /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261C41D551BF0000F703F /* libicucore.tbd */; };
3131
D97261C71D551BF5000F703F /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261C61D551BF5000F703F /* CFNetwork.framework */; };
3232
D97261C91D551BFF000F703F /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261C81D551BFF000F703F /* AddressBook.framework */; };
33-
D98A11F41D8D167D004DB865 /* AppDelegate+Firestack.m in Sources */ = {isa = PBXBuildFile; fileRef = D98A11F31D8D167D004DB865 /* AppDelegate+Firestack.m */; };
3433
D9A8C7A41D7E54C900142F94 /* libPods-Firestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D95036B81D19C90300F7094D /* libPods-Firestack.a */; };
3534
D9D62E7C1D6D86FD003D826D /* FirestackStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = D9D62E7B1D6D86FD003D826D /* FirestackStorage.m */; };
3635
D9D62E801D6D8717003D826D /* FirestackAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = D9D62E7F1D6D8717003D826D /* FirestackAuth.m */; };
@@ -99,8 +98,7 @@
9998
D97261C41D551BF0000F703F /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
10099
D97261C61D551BF5000F703F /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
101100
D97261C81D551BFF000F703F /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
102-
D98A11F21D8D167D004DB865 /* AppDelegate+Firestack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "AppDelegate+Firestack.h"; path = "Firestack/AppDelegate+Firestack.h"; sourceTree = "<group>"; };
103-
D98A11F31D8D167D004DB865 /* AppDelegate+Firestack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "AppDelegate+Firestack.m"; path = "Firestack/AppDelegate+Firestack.m"; sourceTree = "<group>"; };
101+
D984ECF51D9253930037D97B /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = Firestack/module.modulemap; sourceTree = SOURCE_ROOT; };
104102
D9CFBE441D531058002623BF /* buildScript.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = buildScript.sh; sourceTree = "<group>"; };
105103
D9D62E7A1D6D86FD003D826D /* FirestackStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirestackStorage.h; path = Firestack/FirestackStorage.h; sourceTree = "<group>"; };
106104
D9D62E7B1D6D86FD003D826D /* FirestackStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirestackStorage.m; path = Firestack/FirestackStorage.m; sourceTree = "<group>"; };
@@ -177,7 +175,7 @@
177175
58B511D21A9E6C8500147676 = {
178176
isa = PBXGroup;
179177
children = (
180-
D98A11F61D8D1683004DB865 /* Extensions */,
178+
D984ECF51D9253930037D97B /* module.modulemap */,
181179
D96290351D6D145F0099A3EC /* Modules */,
182180
D9CFBE441D531058002623BF /* buildScript.sh */,
183181
D950369C1D19C77400F7094D /* Firestack.h */,
@@ -225,15 +223,6 @@
225223
name = Modules;
226224
sourceTree = "<group>";
227225
};
228-
D98A11F61D8D1683004DB865 /* Extensions */ = {
229-
isa = PBXGroup;
230-
children = (
231-
D98A11F21D8D167D004DB865 /* AppDelegate+Firestack.h */,
232-
D98A11F31D8D167D004DB865 /* AppDelegate+Firestack.m */,
233-
);
234-
name = Extensions;
235-
sourceTree = "<group>";
236-
};
237226
/* End PBXGroup section */
238227

239228
/* Begin PBXNativeTarget section */
@@ -347,7 +336,6 @@
347336
D9D62E7C1D6D86FD003D826D /* FirestackStorage.m in Sources */,
348337
D962903F1D6D15B00099A3EC /* FirestackErrors.m in Sources */,
349338
D950369E1D19C77400F7094D /* Firestack.m in Sources */,
350-
D98A11F41D8D167D004DB865 /* AppDelegate+Firestack.m in Sources */,
351339
D90882D61D89C18C00FB6742 /* FirestackCloudMessaging.m in Sources */,
352340
D96290851D6D28B80099A3EC /* FirestackDatabase.m in Sources */,
353341
);
@@ -444,7 +432,9 @@
444432
isa = XCBuildConfiguration;
445433
baseConfigurationReference = EF9B4692F57E7CF2C25A04C2 /* Pods-Firestack.debug.xcconfig */;
446434
buildSettings = {
435+
DEFINES_MODULE = YES;
447436
DYLIB_INSTALL_NAME_BASE = "";
437+
EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
448438
ENABLE_BITCODE = NO;
449439
FRAMEWORK_SEARCH_PATHS = (
450440
"$(inherited)",
@@ -474,6 +464,7 @@
474464
LD_DYLIB_INSTALL_NAME = "@rpath/${EXECUTABLE_NAME}";
475465
LIBRARY_SEARCH_PATHS = "$(inherited)";
476466
MACH_O_TYPE = mh_dylib;
467+
MODULEMAP_FILE = module.modulemap;
477468
ONLY_ACTIVE_ARCH = YES;
478469
OTHER_LDFLAGS = (
479470
"$(inherited)",
@@ -489,7 +480,9 @@
489480
isa = XCBuildConfiguration;
490481
baseConfigurationReference = 61152A448EBF126366D048D6 /* Pods-Firestack.release.xcconfig */;
491482
buildSettings = {
483+
DEFINES_MODULE = YES;
492484
DYLIB_INSTALL_NAME_BASE = "";
485+
EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
493486
ENABLE_BITCODE = NO;
494487
FRAMEWORK_SEARCH_PATHS = (
495488
"$(inherited)",
@@ -519,6 +512,7 @@
519512
LD_DYLIB_INSTALL_NAME = "@rpath/${EXECUTABLE_NAME}";
520513
LIBRARY_SEARCH_PATHS = "$(inherited)";
521514
MACH_O_TYPE = mh_dylib;
515+
MODULEMAP_FILE = module.modulemap;
522516
OTHER_LDFLAGS = (
523517
"$(inherited)",
524518
"-undefined",

ios/Firestack/AppDelegate+Firestack.h

-6
This file was deleted.

ios/Firestack/AppDelegate+Firestack.m

-94
This file was deleted.

ios/Firestack/Firestack.h

+4-8
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,20 @@
44
// Copyright © 2016 Facebook. All rights reserved.
55
//
66

7-
// #import <UIKit/UIKit.h>
8-
#import "Firebase.h"
7+
#import <UIKit/UIKit.h>
98
#import "RCTBridgeModule.h"
109
#import "RCTEventDispatcher.h"
1110
#import "RCTEventEmitter.h"
12-
#import "AppDelegate+Firestack.h"
1311

1412
@interface Firestack : RCTEventEmitter <RCTBridgeModule> {
15-
FIRAuthStateDidChangeListenerHandle authListenerHandle;
1613
}
1714

1815
// + (void) registerForNotification:(NSString *) typeStr andToken:(NSData *)deviceToken;
19-
// + (void) setup:(UIApplication *) application;
16+
+ (void) setup:(UIApplication *) application
17+
withLaunchOptions: (NSDictionary *) launchOptions;
2018

2119
+ (void) reloadFirestack;
22-
+ (void) initializeFirestack:(Firestack *) instance;
23-
+ (instancetype) sharedInstance;
24-
- (FIRApp *) firebaseApp;
20+
+ (id) sharedInstance;
2521

2622
- (void) debugLog:(NSString *)title
2723
msg:(NSString *)msg;

0 commit comments

Comments
 (0)