Skip to content

Commit 7e257e3

Browse files
aaustinaaustin
authored
Merge pull request #376 from BranchMetrics/umbrella-header
kill old umbrella header
2 parents cb72835 + bf87a9a commit 7e257e3

File tree

17 files changed

+95
-139
lines changed

17 files changed

+95
-139
lines changed

‎Branch-SDK/Branch-SDK/BNCCallbacks.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// BNCCallbacks.h
3+
// Branch-TestBed
4+
//
5+
// Created by Ahmed Nawar on 6/18/16.
6+
// Copyright © 2016 Branch Metrics. All rights reserved.
7+
//
8+
9+
#ifndef BNCCallbacks_h
10+
#define BNCCallbacks_h
11+
12+
@class BranchUniversalObject, BranchLinkProperties;
13+
14+
typedef void (^callbackWithParams) (NSDictionary *params, NSError *error);
15+
typedef void (^callbackWithUrl) (NSString *url, NSError *error);
16+
typedef void (^callbackWithStatus) (BOOL changed, NSError *error);
17+
typedef void (^callbackWithList) (NSArray *list, NSError *error);
18+
typedef void (^callbackWithUrlAndSpotlightIdentifier) (NSString *url, NSString *spotlightIdentifier, NSError *error);
19+
typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject *universalObject, BranchLinkProperties *linkProperties, NSError *error);
20+
21+
#endif /* BNCCallbacks_h */

‎Branch-SDK/Branch-SDK/Branch.h‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,25 @@
77
//
88
#import <Foundation/Foundation.h>
99
#import <UIKit/UIKit.h>
10-
#import "BranchActivityItemProvider.h"
10+
#import "BNCConfig.h"
11+
#import "BranchView.h"
12+
#import "BNCCallbacks.h"
13+
#import "BNCLinkCache.h"
14+
#import "BranchViewHandler.h"
1115
#import "BNCServerInterface.h"
16+
#import "BNCPreferenceHelper.h"
17+
#import "BranchLinkProperties.h"
18+
#import "BranchUniversalObject.h"
1219
#import "BNCServerRequestQueue.h"
13-
#import "BNCLinkCache.h"
20+
#import "BranchActivityItemProvider.h"
1421
#import "BranchDeepLinkingController.h"
15-
#import "BNCPreferenceHelper.h"
16-
@class BranchUniversalObject;
17-
@class BranchLinkProperties;
1822

1923
/**
2024
`Branch` is the primary interface of the Branch iOS SDK. Currently, all interactions you will make are funneled through this class. It is not meant to be instantiated or subclassed, usage should be limited to the global instance.
2125
2226
Note, when `getInstance` is called, it assumes that you have already placed a Branch Key in your main `Info.plist` file for your project. For additional information on configuring the Branch SDK, check out the getting started guides in the Readme.
2327
*/
2428

25-
typedef void (^callbackWithParams) (NSDictionary *params, NSError *error);
26-
typedef void (^callbackWithUrl) (NSString *url, NSError *error);
27-
typedef void (^callbackWithStatus) (BOOL changed, NSError *error);
28-
typedef void (^callbackWithList) (NSArray *list, NSError *error);
29-
typedef void (^callbackWithUrlAndSpotlightIdentifier) (NSString *url, NSString *spotlightIdentifier, NSError *error);
30-
typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject *universalObject, BranchLinkProperties *linkProperties, NSError *error);
31-
3229
///----------------
3330
/// @name Constants
3431
///----------------

‎Branch-SDK/Branch-SDK/BranchSDK.h‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Branch-SDK/Branch-SDK/BranchUniversalObject.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
//
88

99
#import <Foundation/Foundation.h>
10-
#import "BranchLinkProperties.h"
1110
#import "Branch.h"
1211

12+
@class BranchLinkProperties;
13+
1314
typedef void (^callback) ();
1415
typedef void (^shareCompletion) (NSString *activityType, BOOL completed);
1516

‎Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
46DC40801B2B84CD00D2D203 /* BranchShortUrlRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46DC407F1B2B84CD00D2D203 /* BranchShortUrlRequestTests.m */; };
103103
46FD92BA1AE7E8F80012E78F /* BNCSystemObserverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */; };
104104
46FFCF171ACC321A00039CE0 /* BNCEncodingUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46FFCF161ACC321A00039CE0 /* BNCEncodingUtilsTests.m */; };
105-
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
105+
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */; };
106106
54391A161BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 54391A141BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m */; };
107107
54FF1F8D1BD1D4AE0004CE2E /* BranchUniversalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 54FF1F8B1BD1D4AE0004CE2E /* BranchUniversalObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
108108
54FF1F8E1BD1D4AE0004CE2E /* BranchUniversalObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 54FF1F8C1BD1D4AE0004CE2E /* BranchUniversalObject.m */; };
@@ -132,7 +132,7 @@
132132
9F4BE02E2EFA48B94EB8CEAD /* libPods-Branch-SDK-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA508DAFBC70E7B594A5D76C /* libPods-Branch-SDK-Tests.a */; };
133133
E2133B731D01297E00763049 /* BNCFabricAnswers.h in Headers */ = {isa = PBXBuildFile; fileRef = E2133B711D0125EF00763049 /* BNCFabricAnswers.h */; };
134134
E2133B751D01477200763049 /* BNCFabricAnswers.m in Sources */ = {isa = PBXBuildFile; fileRef = E2133B741D01477200763049 /* BNCFabricAnswers.m */; };
135-
E2546CDA1C82B164006AD5D2 /* BranchSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = E2546CD91C82B164006AD5D2 /* BranchSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
135+
E2B9474A1D15D75000F2270D /* BNCCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = E2B947491D15D73900F2270D /* BNCCallbacks.h */; settings = {ATTRIBUTES = (Public, ); }; };
136136
/* End PBXBuildFile section */
137137

138138
/* Begin PBXContainerItemProxy section */
@@ -299,9 +299,9 @@
299299
E214D4421CAF42F5007FF922 /* FABKitProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FABKitProtocol.h; path = "../Branch-SDK/Fabric/FABKitProtocol.h"; sourceTree = "<group>"; };
300300
E214D4431CAF42F5007FF922 /* Fabric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fabric.h; path = "../Branch-SDK/Fabric/Fabric.h"; sourceTree = "<group>"; };
301301
E214D4441CAF42F5007FF922 /* Fabric+FABKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Fabric+FABKits.h"; path = "../Branch-SDK/Fabric/Fabric+FABKits.h"; sourceTree = "<group>"; };
302-
E2546CD91C82B164006AD5D2 /* BranchSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchSDK.h; sourceTree = "<group>"; };
303302
E2B597061D063EEF00A089A6 /* Answers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Answers.h; path = "../Branch-SDK/Fabric/Answers.h"; sourceTree = "<group>"; };
304303
E2B597081D063F1D00A089A6 /* ANSCompatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ANSCompatibility.h; path = "../Branch-SDK/Fabric/ANSCompatibility.h"; sourceTree = "<group>"; };
304+
E2B947491D15D73900F2270D /* BNCCallbacks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNCCallbacks.h; sourceTree = "<group>"; };
305305
FDC715ABABBD5DC03AF5936B /* libPods-Branch-SDK Debugger Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Branch-SDK Debugger Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
306306
/* End PBXFileReference section */
307307

@@ -496,6 +496,7 @@
496496
670016BB1946309100A9E103 /* Branch-SDK */ = {
497497
isa = PBXGroup;
498498
children = (
499+
E2B947491D15D73900F2270D /* BNCCallbacks.h */,
499500
7D4DAC221C8FA908008E37DB /* BranchViewHandler.m */,
500501
7D4DAC231C8FA908008E37DB /* BranchView.m */,
501502
7D4DAC241C8FA908008E37DB /* BranchViewHandler.h */,
@@ -521,7 +522,6 @@
521522
7E30BCF21A71EEEE00AC7402 /* BNCLinkData.h */,
522523
7E30BCF31A71EEEE00AC7402 /* BNCLinkData.m */,
523524
7E30BCF51A72FE7900AC7402 /* BNCLinkCache.h */,
524-
E2546CD91C82B164006AD5D2 /* BranchSDK.h */,
525525
7E30BCF61A72FE7900AC7402 /* BNCLinkCache.m */,
526526
D258D2C41A794D64004A1C90 /* BranchActivityItemProvider.h */,
527527
D258D2C51A794D64004A1C90 /* BranchActivityItemProvider.m */,
@@ -612,19 +612,15 @@
612612
466B587D1B17780A00A69EDE /* BNCLinkCache.h in Headers */,
613613
466B587C1B17780A00A69EDE /* BNCLinkData.h in Headers */,
614614
462B50461B449DF000967B81 /* BranchDeepLinkingController.h in Headers */,
615+
E2B9474A1D15D75000F2270D /* BNCCallbacks.h in Headers */,
615616
54FF1F951BD20EB50004CE2E /* BranchRegisterViewRequest.h in Headers */,
616617
46946B851B26898800627BCC /* BNCServerRequest.h in Headers */,
617618
466D5A111B5991E3009DB845 /* BNCContentDiscoveryManager.h in Headers */,
618619
466B58741B17780A00A69EDE /* BNCPreferenceHelper.h in Headers */,
619-
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */,
620620
466B58791B17780A00A69EDE /* BNCConfig.h in Headers */,
621-
E2546CDA1C82B164006AD5D2 /* BranchSDK.h in Headers */,
622621
7D4DAC211C8FA8C0008E37DB /* BranchView.h in Headers */,
623622
7D4DAC271C8FA908008E37DB /* BranchViewHandler.h in Headers */,
624-
E214D4451CAF432C007FF922 /* FABAttributes.h in Headers */,
625-
E214D4461CAF432C007FF922 /* FABKitProtocol.h in Headers */,
626-
E214D4471CAF432C007FF922 /* Fabric.h in Headers */,
627-
E214D4481CAF432C007FF922 /* Fabric+FABKits.h in Headers */,
623+
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */,
628624
54FF1F8D1BD1D4AE0004CE2E /* BranchUniversalObject.h in Headers */,
629625
46946B9F1B2689A100627BCC /* BranchShortUrlSyncRequest.h in Headers */,
630626
46946B9E1B2689A100627BCC /* BranchShortUrlRequest.h in Headers */,
@@ -956,8 +952,10 @@
956952
466B58491B17773000A69EDE /* Debug */ = {
957953
isa = XCBuildConfiguration;
958954
buildSettings = {
955+
CLANG_ENABLE_MODULES = NO;
959956
CLANG_WARN_UNREACHABLE_CODE = YES;
960957
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
958+
DEFINES_MODULE = NO;
961959
ENABLE_STRICT_OBJC_MSGSEND = YES;
962960
GCC_NO_COMMON_BLOCKS = YES;
963961
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -977,9 +975,11 @@
977975
466B584A1B17773000A69EDE /* Release */ = {
978976
isa = XCBuildConfiguration;
979977
buildSettings = {
978+
CLANG_ENABLE_MODULES = NO;
980979
CLANG_WARN_UNREACHABLE_CODE = YES;
981980
COPY_PHASE_STRIP = NO;
982981
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
982+
DEFINES_MODULE = NO;
983983
ENABLE_STRICT_OBJC_MSGSEND = YES;
984984
GCC_NO_COMMON_BLOCKS = YES;
985985
IPHONEOS_DEPLOYMENT_TARGET = 6.0;

‎Branch-TestBed/module.modulemap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
framework module Branch {
2-
umbrella header "BranchSDK.h"
2+
umbrella header "Branch.h"
33

44
export *
55
module * { export * }

‎Branch.framework.zip‎

-5.78 MB
Binary file not shown.

‎Branch.framework/Modules/module.modulemap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
framework module Branch {
2-
umbrella header "BranchSDK.h"
2+
umbrella header "Branch.h"
33

44
export *
55
module * { export * }

‎Branch.framework/Versions/A/Branch‎

2.27 KB
Binary file not shown.

‎Branch.framework/Versions/A/Headers/BNCCallbacks.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// BNCCallbacks.h
3+
// Branch-TestBed
4+
//
5+
// Created by Ahmed Nawar on 6/18/16.
6+
// Copyright © 2016 Branch Metrics. All rights reserved.
7+
//
8+
9+
#ifndef BNCCallbacks_h
10+
#define BNCCallbacks_h
11+
12+
@class BranchUniversalObject, BranchLinkProperties;
13+
14+
typedef void (^callbackWithParams) (NSDictionary *params, NSError *error);
15+
typedef void (^callbackWithUrl) (NSString *url, NSError *error);
16+
typedef void (^callbackWithStatus) (BOOL changed, NSError *error);
17+
typedef void (^callbackWithList) (NSArray *list, NSError *error);
18+
typedef void (^callbackWithUrlAndSpotlightIdentifier) (NSString *url, NSString *spotlightIdentifier, NSError *error);
19+
typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject *universalObject, BranchLinkProperties *linkProperties, NSError *error);
20+
21+
#endif /* BNCCallbacks_h */

0 commit comments

Comments
 (0)