Skip to content

Commit 97073c1

Browse files
committed
Updates for 0.12.0 release.
1 parent cae2194 commit 97073c1

File tree

15 files changed

+331
-15
lines changed

15 files changed

+331
-15
lines changed

Branch-SDK/Branch-SDK/BNCConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef Branch_SDK_Config_h
1010
#define Branch_SDK_Config_h
1111

12-
#define SDK_VERSION @"0.11.18"
12+
#define SDK_VERSION @"0.12.0"
1313

1414
#define BNC_PROD_ENV
1515
//#define BNC_STAGE_ENV

Branch-SDK/Fabric/FABAttributes.h

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
//
2+
// FABAttributes.h
3+
// Fabric
4+
//
5+
// Copyright (C) 2015 Twitter, Inc.
6+
//
7+
// Licensed under the Apache License, Version 2.0 (the "License");
8+
// you may not use this file except in compliance with the License.
9+
// You may obtain a copy of the License at
10+
//
11+
// http://www.apache.org/licenses/LICENSE-2.0
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
18+
//
19+
20+
#pragma once
21+
22+
#define FAB_UNAVAILABLE(x) __attribute__((unavailable(x)))
23+
24+
#if __has_feature(nullability)
25+
#define fab_nullable nullable
26+
#define fab_nonnull nonnull
27+
#define fab_null_unspecified null_unspecified
28+
#define fab_null_resettable null_resettable
29+
#define __fab_nullable __nullable
30+
#define __fab_nonnull __nonnull
31+
#define __fab_null_unspecified __null_unspecified
32+
#else
33+
#define fab_nullable
34+
#define fab_nonnull
35+
#define fab_null_unspecified
36+
#define fab_null_resettable
37+
#define __fab_nullable
38+
#define __fab_nonnull
39+
#define __fab_null_unspecified
40+
#endif
41+
42+
#ifndef NS_ASSUME_NONNULL_BEGIN
43+
#define NS_ASSUME_NONNULL_BEGIN
44+
#endif
45+
46+
#ifndef NS_ASSUME_NONNULL_END
47+
#define NS_ASSUME_NONNULL_END
48+
#endif
49+
50+
51+
/**
52+
* The following macros are defined here to provide
53+
* backwards compatability. If you are still using
54+
* them you should migrate to the new versions that
55+
* are defined above.
56+
*/
57+
#define FAB_NONNULL __fab_nonnull
58+
#define FAB_NULLABLE __fab_nullable
59+
#define FAB_START_NONNULL NS_ASSUME_NONNULL_BEGIN
60+
#define FAB_END_NONNULL NS_ASSUME_NONNULL_END

Branch-SDK/Fabric/FABKitProtocol.h

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
//
2+
// FABKitProtocol.h
3+
// Fabric
4+
//
5+
// Copyright (C) 2015 Twitter, Inc.
6+
//
7+
// Licensed under the Apache License, Version 2.0 (the "License");
8+
// you may not use this file except in compliance with the License.
9+
// You may obtain a copy of the License at
10+
//
11+
// http://www.apache.org/licenses/LICENSE-2.0
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
18+
//
19+
20+
#import <Foundation/Foundation.h>
21+
22+
/**
23+
* Protocol that a class in a Fabric Kit must conform to to provide information to Fabric at runtime.
24+
*/
25+
@protocol FABKit <NSObject>
26+
27+
@required
28+
29+
/**
30+
* Required. The globally unique identifier of the Kit.
31+
* We encourage the use of reverse-DNS notation.
32+
* Example: @"io.fabric.sdk.ios"
33+
*/
34+
+ (NSString *)bundleIdentifier;
35+
36+
/**
37+
* Required. Must return the current version of the Kit that is being used at runtime.
38+
* We encourage the use of semantic versioning (http://semver.org/), without prefixing the version with a "v".
39+
* This is commonly referred to as the "marketing version".
40+
* Example: @"1.2.3"
41+
*/
42+
+ (NSString *)kitDisplayVersion;
43+
44+
@optional
45+
46+
/**
47+
* The build version of the kit. Should be monotonically increasing and unique.
48+
* Example: 137
49+
*/
50+
+ (NSString *)kitBuildVersion;
51+
52+
/**
53+
* Perform any necessary initialization.
54+
* This method will be invoked on the Kit when the user calls +[Fabric initializeKits].
55+
* @note This method being called does not necessarily imply that the developer has started using the Kit yet.
56+
*/
57+
+ (void)initializeIfNeeded;
58+
59+
@end

Branch-SDK/Fabric/Fabric+FABKits.h

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
//
2+
// Fabric+FABKits.h
3+
// Fabric
4+
//
5+
// Copyright (C) 2015 Twitter, Inc.
6+
//
7+
// Licensed under the Apache License, Version 2.0 (the "License");
8+
// you may not use this file except in compliance with the License.
9+
// You may obtain a copy of the License at
10+
//
11+
// http://www.apache.org/licenses/LICENSE-2.0
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
18+
//
19+
20+
#import "Fabric.h"
21+
22+
@protocol FABKit;
23+
// Use this category for methods that kits can call on Fabric.
24+
@interface Fabric (FABKits)
25+
26+
/**
27+
* Returns a dictionary containing the kit configuration info for the provided kit.
28+
* The configuration information is parsed from the application's Info.plist. This
29+
* method is primarily intended to be used by kits to retrieve their configuration.
30+
*
31+
* @param kitClass The class of the kit whose configuration should be returned.
32+
* It should conform to the FABKit protocol.
33+
*
34+
* @return A dictionary containing kit specific configuration information or nil if none exists.
35+
*/
36+
+ (fab_nonnull NSDictionary *)configurationDictionaryForKitClass:(fab_nonnull Class)kitClass;
37+
38+
@end

Branch-SDK/Fabric/Fabric.h

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
//
2+
// Fabric.h
3+
// Fabric
4+
//
5+
// Copyright (C) 2015 Twitter, Inc.
6+
//
7+
// Licensed under the Apache License, Version 2.0 (the "License");
8+
// you may not use this file except in compliance with the License.
9+
// You may obtain a copy of the License at
10+
//
11+
// http://www.apache.org/licenses/LICENSE-2.0
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
18+
//
19+
20+
#import <Foundation/Foundation.h>
21+
#import "FABAttributes.h"
22+
23+
NS_ASSUME_NONNULL_BEGIN
24+
25+
/**
26+
* Fabric Base. Coordinates configuration and starts all provided kits.
27+
*/
28+
@interface Fabric : NSObject
29+
30+
/**
31+
* Initialize Fabric and all provided kits. Call this method within your App Delegate's `application:didFinishLaunchingWithOptions:` and provide the kits you wish to use.
32+
*
33+
* For example, in Objective-C:
34+
*
35+
* `[Fabric with:@[[Crashlytics class], [Twitter class], [Digits class], [MoPub class]]];`
36+
*
37+
* Swift:
38+
*
39+
* `Fabric.with([Crashlytics.self(), Twitter.self(), Digits.self(), MoPub.self()])`
40+
*
41+
* Only the first call to this method is honored. Subsequent calls are no-ops.
42+
*
43+
* @param kits An array of kit Class objects
44+
*
45+
* @return Returns the shared Fabric instance. In most cases this can be ignored.
46+
*/
47+
+ (instancetype)with:(NSArray *)kitClasses;
48+
49+
/**
50+
* Returns the Fabric singleton object.
51+
*/
52+
+ (instancetype)sharedSDK;
53+
54+
/**
55+
* This BOOL enables or disables debug logging, such as kit version information. The default value is NO.
56+
*/
57+
@property (nonatomic, assign) BOOL debug;
58+
59+
/**
60+
* Unavailable. Use `+sharedSDK` to retrieve the shared Fabric instance.
61+
*/
62+
- (id)init FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
63+
64+
@end
65+
66+
NS_ASSUME_NONNULL_END
67+

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@
130130
7D58823A1CA1DF2700FF6358 /* BNCDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5882391CA1DF2700FF6358 /* BNCDeviceInfo.m */; };
131131
7E6B3B561AA42D0E005F45BF /* Branch_SDK_Functionality_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E6B3B551AA42D0E005F45BF /* Branch_SDK_Functionality_Tests.m */; };
132132
9F4BE02E2EFA48B94EB8CEAD /* libPods-Branch-SDK-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA508DAFBC70E7B594A5D76C /* libPods-Branch-SDK-Tests.a */; };
133+
E214D3801CADFD58007FF922 /* FABAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = E214D37C1CADFD58007FF922 /* FABAttributes.h */; };
134+
E214D3811CADFD58007FF922 /* FABKitProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = E214D37D1CADFD58007FF922 /* FABKitProtocol.h */; };
135+
E214D3821CADFD58007FF922 /* Fabric.h in Headers */ = {isa = PBXBuildFile; fileRef = E214D37E1CADFD58007FF922 /* Fabric.h */; };
136+
E214D3831CADFD58007FF922 /* Fabric+FABKits.h in Headers */ = {isa = PBXBuildFile; fileRef = E214D37F1CADFD58007FF922 /* Fabric+FABKits.h */; };
133137
E2546CDA1C82B164006AD5D2 /* BranchSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = E2546CD91C82B164006AD5D2 /* BranchSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
134138
/* End PBXBuildFile section */
135139

@@ -291,10 +295,10 @@
291295
D258D2C41A794D64004A1C90 /* BranchActivityItemProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchActivityItemProvider.h; sourceTree = "<group>"; };
292296
D258D2C51A794D64004A1C90 /* BranchActivityItemProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchActivityItemProvider.m; sourceTree = "<group>"; };
293297
D85A06FB422AB22B126B40DE /* libPods-Branch-SDK Load Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Branch-SDK Load Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
294-
E220F4241C7D39CD00F5B126 /* FABAttributes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FABAttributes.h; sourceTree = "<group>"; };
295-
E220F4251C7D39CD00F5B126 /* FABKitProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FABKitProtocol.h; sourceTree = "<group>"; };
296-
E220F4261C7D39CD00F5B126 /* Fabric.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Fabric.h; sourceTree = "<group>"; };
297-
E220F4271C7D39CD00F5B126 /* Fabric+FABKits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Fabric+FABKits.h"; sourceTree = "<group>"; };
298+
E214D37C1CADFD58007FF922 /* FABAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FABAttributes.h; sourceTree = "<group>"; };
299+
E214D37D1CADFD58007FF922 /* FABKitProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FABKitProtocol.h; sourceTree = "<group>"; };
300+
E214D37E1CADFD58007FF922 /* Fabric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Fabric.h; sourceTree = "<group>"; };
301+
E214D37F1CADFD58007FF922 /* Fabric+FABKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Fabric+FABKits.h"; sourceTree = "<group>"; };
298302
E2546CD91C82B164006AD5D2 /* BranchSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchSDK.h; sourceTree = "<group>"; };
299303
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; };
300304
/* End PBXFileReference section */
@@ -570,10 +574,10 @@
570574
E220F4281C7D39D500F5B126 /* Fabric */ = {
571575
isa = PBXGroup;
572576
children = (
573-
E220F4241C7D39CD00F5B126 /* FABAttributes.h */,
574-
E220F4251C7D39CD00F5B126 /* FABKitProtocol.h */,
575-
E220F4261C7D39CD00F5B126 /* Fabric.h */,
576-
E220F4271C7D39CD00F5B126 /* Fabric+FABKits.h */,
577+
E214D37C1CADFD58007FF922 /* FABAttributes.h */,
578+
E214D37D1CADFD58007FF922 /* FABKitProtocol.h */,
579+
E214D37E1CADFD58007FF922 /* Fabric.h */,
580+
E214D37F1CADFD58007FF922 /* Fabric+FABKits.h */,
577581
);
578582
name = Fabric;
579583
sourceTree = "<group>";
@@ -595,6 +599,7 @@
595599
buildActionMask = 2147483647;
596600
files = (
597601
466B58721B17780A00A69EDE /* Branch.h in Headers */,
602+
E214D3831CADFD58007FF922 /* Fabric+FABKits.h in Headers */,
598603
466B587E1B17780A00A69EDE /* BranchActivityItemProvider.h in Headers */,
599604
46946B9A1B2689A100627BCC /* BranchCreditHistoryRequest.h in Headers */,
600605
46946B871B26898E00627BCC /* BranchLogoutRequest.h in Headers */,
@@ -607,11 +612,13 @@
607612
466D5A111B5991E3009DB845 /* BNCContentDiscoveryManager.h in Headers */,
608613
466B58741B17780A00A69EDE /* BNCPreferenceHelper.h in Headers */,
609614
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */,
615+
E214D3821CADFD58007FF922 /* Fabric.h in Headers */,
610616
466B58791B17780A00A69EDE /* BNCConfig.h in Headers */,
611617
E2546CDA1C82B164006AD5D2 /* BranchSDK.h in Headers */,
612618
7D4DAC271C8FA908008E37DB /* BranchViewHandler.h in Headers */,
613619
54FF1F8D1BD1D4AE0004CE2E /* BranchUniversalObject.h in Headers */,
614620
46946B9F1B2689A100627BCC /* BranchShortUrlSyncRequest.h in Headers */,
621+
E214D3811CADFD58007FF922 /* FABKitProtocol.h in Headers */,
615622
46946B9E1B2689A100627BCC /* BranchShortUrlRequest.h in Headers */,
616623
46946B9D1B2689A100627BCC /* BranchApplyPromoCodeRequest.h in Headers */,
617624
466B58781B17780A00A69EDE /* BNCServerRequestQueue.h in Headers */,
@@ -631,6 +638,7 @@
631638
466B58771B17780A00A69EDE /* BNCSystemObserver.h in Headers */,
632639
7D4DAC211C8FA8C0008E37DB /* BranchView.h in Headers */,
633640
46946B881B26899100627BCC /* BranchUserCompletedActionRequest.h in Headers */,
641+
E214D3801CADFD58007FF922 /* FABAttributes.h in Headers */,
634642
466B587A1B17780A00A69EDE /* BNCError.h in Headers */,
635643
46946BA01B2689A100627BCC /* BranchCloseRequest.h in Headers */,
636644
);
@@ -1052,6 +1060,7 @@
10521060
670016931940F51400A9E103 /* Debug */ = {
10531061
isa = XCBuildConfiguration;
10541062
buildSettings = {
1063+
ALWAYS_SEARCH_USER_PATHS = YES;
10551064
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10561065
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
10571066
CODE_SIGN_ENTITLEMENTS = "Branch-TestBed/Branch-TestBed.entitlements";
@@ -1064,13 +1073,15 @@
10641073
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
10651074
PRODUCT_NAME = "$(TARGET_NAME)";
10661075
PROVISIONING_PROFILE = "";
1076+
USER_HEADER_SEARCH_PATHS = $PROJECT_DIR;
10671077
WRAPPER_EXTENSION = app;
10681078
};
10691079
name = Debug;
10701080
};
10711081
670016941940F51400A9E103 /* Release */ = {
10721082
isa = XCBuildConfiguration;
10731083
buildSettings = {
1084+
ALWAYS_SEARCH_USER_PATHS = YES;
10741085
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10751086
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
10761087
CODE_SIGN_ENTITLEMENTS = "Branch-TestBed/Branch-TestBed.entitlements";
@@ -1083,6 +1094,7 @@
10831094
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
10841095
PRODUCT_NAME = "$(TARGET_NAME)";
10851096
PROVISIONING_PROFILE = "";
1097+
USER_HEADER_SEARCH_PATHS = $PROJECT_DIR;
10861098
WRAPPER_EXTENSION = app;
10871099
};
10881100
name = Release;

Branch.framework/Info.plist

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>AppIdentifierPrefix</key>
6+
<string>$(AppIdentifierPrefix)</string>
7+
<key>CFBundleDevelopmentRegion</key>
8+
<string>en</string>
9+
<key>CFBundleDisplayName</key>
10+
<string>${PRODUCT_NAME}</string>
11+
<key>CFBundleExecutable</key>
12+
<string>${EXECUTABLE_NAME}</string>
13+
<key>CFBundleIdentifier</key>
14+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
15+
<key>CFBundleInfoDictionaryVersion</key>
16+
<string>6.0</string>
17+
<key>CFBundleName</key>
18+
<string>${PRODUCT_NAME}</string>
19+
<key>CFBundlePackageType</key>
20+
<string>APPL</string>
21+
<key>CFBundleShortVersionString</key>
22+
<string>0.12.0</string>
23+
<key>CFBundleSignature</key>
24+
<string>????</string>
25+
<key>CFBundleURLTypes</key>
26+
<array>
27+
<dict>
28+
<key>CFBundleURLSchemes</key>
29+
<array>
30+
<string>branchtest</string>
31+
</array>
32+
</dict>
33+
</array>
34+
<key>CFBundleVersion</key>
35+
<string>1</string>
36+
<key>LSApplicationCategoryType</key>
37+
<string></string>
38+
<key>LSRequiresIPhoneOS</key>
39+
<true/>
40+
<key>UIMainStoryboardFile</key>
41+
<string>Main</string>
42+
<key>UIRequiredDeviceCapabilities</key>
43+
<array>
44+
<string>armv7</string>
45+
</array>
46+
<key>UISupportedInterfaceOrientations</key>
47+
<array>
48+
<string>UIInterfaceOrientationPortrait</string>
49+
</array>
50+
<key>branch_key</key>
51+
<dict>
52+
<key>live</key>
53+
<string>key_live_jbgnjxvlhSb6PGH23BhO4hiflcp3y8kx</string>
54+
<key>test</key>
55+
<string>key_test_jkptOCZtmtxhOMZ11ynbXecdDCd93cbr</string>
56+
</dict>
57+
</dict>
58+
</plist>

0 commit comments

Comments
 (0)