Skip to content

Commit

Permalink
Support latest SDKs and .net7
Browse files Browse the repository at this point in the history
  • Loading branch information
nsingh-branch committed Oct 11, 2024
1 parent 789b045 commit 84c3931
Show file tree
Hide file tree
Showing 36 changed files with 99 additions and 67 deletions.
24 changes: 12 additions & 12 deletions Branch-Xamarin-SDK.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<copyright>Copyright 2020 Branch Metrics, Inc.</copyright>
<tags>Xamarin Branch deep linking tracking measurement iOS Android sharing referral invite analytics</tags>
<dependencies>
<group targetFramework="net8.0" >
<group targetFramework="net7.0" >
<dependency id="Newtonsoft.Json" version="13.0.3" />
</group>
<group targetFramework="net8.0-android33" >
<group targetFramework="net7.0-android33" >
<dependency id="Newtonsoft.Json" version="13.0.3" />
<dependency id="Xamarin.Android.Binding.InstallReferrer" version="2.2.0" />
</group>
<group targetFramework="net8.0-ios11.0" >
<group targetFramework="net7.0-ios11.0" >
<dependency id="Newtonsoft.Json" version="13.0.3" />
</group>
</dependencies>
Expand All @@ -32,19 +32,19 @@
<file src="branch_icon.png" target="" />

<!-- Android Binding -->
<file src="BranchSDK.AndroidBinding/bin/Release/net8.0-android/BranchSDK.AndroidBinding.dll" target="lib/net8.0-android33" />
<file src="BranchSDK.AndroidBinding/bin/Release/net8.0-android/BranchSDK.AndroidBinding.xml" target="lib/net8.0-android33" />
<file src="BranchSDK.AndroidBinding/bin/Release/net8.0-android/BranchSDK.AndroidBinding.aar" target="lib/net8.0-android33" />
<file src="BranchSDK.AndroidBinding/bin/Release/net7.0-android/BranchSDK.AndroidBinding.dll" target="lib/net7.0-android33" />
<file src="BranchSDK.AndroidBinding/bin/Release/net7.0-android/BranchSDK.AndroidBinding.xml" target="lib/net7.0-android33" />
<file src="BranchSDK.AndroidBinding/bin/Release/net7.0-android/BranchSDK.AndroidBinding.aar" target="lib/net7.0-android33" />

<!-- iOS Binding -->
<file src="BranchSDK.iOSBinding/bin/Release/net8.0-ios/BranchSDK.iOSBinding.dll" target="lib/net8.0-iOS11.0" />
<file src="BranchSDK.iOSBinding/bin/Release/net8.0-ios/BranchSDK.iOSBinding.resources.zip" target="lib/net8.0-iOS11.0" />
<file src="BranchSDK.iOSBinding/bin/Release/net7.0-ios/BranchSDK.iOSBinding.dll" target="lib/net7.0-iOS11.0" />
<file src="BranchSDK.iOSBinding/bin/Release/net7.0-ios/BranchSDK.iOSBinding.resources.zip" target="lib/net7.0-iOS11.0" />

<!-- Branch SDK -->
<file src="BranchSDK/bin/Release/net8.0-android/BranchSDK.dll" target="lib/net8.0-android33" />
<file src="BranchSDK/bin/Release/net8.0-android/BranchSDK.xml" target="lib/net8.0-android33" />
<file src="BranchSDK/bin/Release/net8.0-ios/BranchSDK.dll" target="lib/net8.0-ios11.0" />
<file src="BranchSDK/bin/Release/net8.0/BranchSDK.dll" target="lib/net8.0" />
<file src="BranchSDK/bin/Release/net7.0-android/BranchSDK.dll" target="lib/net7.0-android33" />
<file src="BranchSDK/bin/Release/net7.0-android/BranchSDK.xml" target="lib/net7.0-android33" />
<file src="BranchSDK/bin/Release/net7.0-ios/BranchSDK.dll" target="lib/net7.0-ios11.0" />
<file src="BranchSDK/bin/Release/net7.0/BranchSDK.dll" target="lib/net7.0" />

</files>
</package>
2 changes: 1 addition & 1 deletion BranchSDK.AndroidBinding/BranchSDK.AndroidBinding.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-android</TargetFramework>
<TargetFramework>net7.0-android</TargetFramework>
<SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions BranchSDK.iOSBinding/ApiDefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3407,9 +3407,9 @@ interface Branch
[Export("isBranchLink:")]
bool IsBranchLink(string urlString);

// -(void)setRequestMetadataKey:(NSString * _Nonnull)key value:(id _Nullable)value;
// -(void)setRequestMetadataKey:(NSString * _Nonnull)key value:(NSString _Nullable)value;
[Export("setRequestMetadataKey:value:")]
void SetRequestMetadataKey(string key, [NullAllowed] NSObject value);
void SetRequestMetadataKey(string key, [NullAllowed] string value);

// +(BOOL)trackingDisabled;
// +(void)setTrackingDisabled:(BOOL)disabled;
Expand Down
2 changes: 1 addition & 1 deletion BranchSDK.iOSBinding/BranchSDK.iOSBinding.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-ios</TargetFramework>
<TargetFramework>net7.0-ios</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
<IsBindingProject>true</IsBindingProject>
Expand Down
20 changes: 10 additions & 10 deletions BranchSDK.iOSBinding/BranchSDK.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,63 +8,63 @@
<key>BinaryPath</key>
<string>BranchSDK.framework/BranchSDK</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>BranchSDK.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>BranchSDK.framework/BranchSDK</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>BranchSDK.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>BranchSDK.framework/BranchSDK</string>
<key>LibraryIdentifier</key>
<string>tvos-arm64_x86_64-simulator</string>
<string>tvos-arm64</string>
<key>LibraryPath</key>
<string>BranchSDK.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>tvos</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>BranchSDK.framework/BranchSDK</string>
<key>LibraryIdentifier</key>
<string>tvos-arm64</string>
<string>tvos-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>BranchSDK.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>tvos</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

@interface BNCServerRequest : NSObject <NSSecureCoding>

@property (nonatomic, copy, readwrite) NSString *requestUUID;
@property (nonatomic, copy, readwrite) NSNumber *requestCreationTimeStamp;

- (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key callback:(BNCServerCallback)callback;
- (void)processResponse:(BNCServerResponse *)response error:(NSError *)error;
- (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableDictionary *)dict;
+ (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate;
@end
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

@interface BNCServerRequestQueue : NSObject

@property (assign, nonatomic) BOOL processArchivedOpens;

- (void)enqueue:(BNCServerRequest *)request;
- (BNCServerRequest *)dequeue;
- (BNCServerRequest *)peek;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,9 @@ Sets a custom base URL for all calls to the Branch API.
Key-value pairs to be included in the metadata on every request.
@param key String to be included in request metadata
@param value Object to be included in request metadata
@param value Value to be included in request metadata
*/
- (void)setRequestMetadataKey:(NSString *)key value:(nullable id)value;
- (void)setRequestMetadataKey:(NSString *)key value:(nullable NSString *)value;

/**
Disables the Branch SDK from tracking the user. This is useful for GDPR privacy compliance.
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

@interface BNCServerRequest : NSObject <NSSecureCoding>

@property (nonatomic, copy, readwrite) NSString *requestUUID;
@property (nonatomic, copy, readwrite) NSNumber *requestCreationTimeStamp;

- (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key callback:(BNCServerCallback)callback;
- (void)processResponse:(BNCServerResponse *)response error:(NSError *)error;
- (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableDictionary *)dict;
+ (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate;
@end
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

@interface BNCServerRequestQueue : NSObject

@property (assign, nonatomic) BOOL processArchivedOpens;

- (void)enqueue:(BNCServerRequest *)request;
- (BNCServerRequest *)dequeue;
- (BNCServerRequest *)peek;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,9 @@ Sets a custom base URL for all calls to the Branch API.
Key-value pairs to be included in the metadata on every request.
@param key String to be included in request metadata
@param value Object to be included in request metadata
@param value Value to be included in request metadata
*/
- (void)setRequestMetadataKey:(NSString *)key value:(nullable id)value;
- (void)setRequestMetadataKey:(NSString *)key value:(nullable NSString *)value;

/**
Disables the Branch SDK from tracking the user. This is useful for GDPR privacy compliance.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>23F79</string>
<string>23G93</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,29 +17,29 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.4.4</string>
<string>3.6.4</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>3.4.4</string>
<string>3.6.4</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string></string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>14.0</string>
<string>14.5</string>
<key>DTSDKBuild</key>
<string>23A334</string>
<string>23F73</string>
<key>DTSDKName</key>
<string>macosx14.0</string>
<string>macosx14.5</string>
<key>DTXcode</key>
<string>1501</string>
<string>1540</string>
<key>DTXcodeBuild</key>
<string>15A507</string>
<string>15F31d</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>UIDeviceFamily</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

@interface BNCServerRequest : NSObject <NSSecureCoding>

@property (nonatomic, copy, readwrite) NSString *requestUUID;
@property (nonatomic, copy, readwrite) NSNumber *requestCreationTimeStamp;

- (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key callback:(BNCServerCallback)callback;
- (void)processResponse:(BNCServerResponse *)response error:(NSError *)error;
- (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableDictionary *)dict;
+ (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate;
@end
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

@interface BNCServerRequestQueue : NSObject

@property (assign, nonatomic) BOOL processArchivedOpens;

- (void)enqueue:(BNCServerRequest *)request;
- (BNCServerRequest *)dequeue;
- (BNCServerRequest *)peek;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,9 @@ Sets a custom base URL for all calls to the Branch API.
Key-value pairs to be included in the metadata on every request.
@param key String to be included in request metadata
@param value Object to be included in request metadata
@param value Value to be included in request metadata
*/
- (void)setRequestMetadataKey:(NSString *)key value:(nullable id)value;
- (void)setRequestMetadataKey:(NSString *)key value:(nullable NSString *)value;

/**
Disables the Branch SDK from tracking the user. This is useful for GDPR privacy compliance.
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@
</data>
<key>Headers/BNCServerRequest.h</key>
<data>
yNbh9Vnv+yhedOGjG8mg9jHeWBs=
qki1SS7nFwijD4fUUF8QQuxf/Os=
</data>
<key>Headers/BNCServerRequestQueue.h</key>
<data>
4QjT1SXnCpJHIFz2UCuZ04NCftY=
bUBx5APIixvz/Y04YM8jl6KKcLU=
</data>
<key>Headers/BNCServerResponse.h</key>
<data>
JKescIIJJU2St0jDT/zy6Fv/AlA=
</data>
<key>Headers/Branch.h</key>
<data>
qjHYTWlChUS6SWEcWsRgsNbIoCk=
BeDG2YtJQow4/6ngB8qAMunmlpM=
</data>
<key>Headers/BranchActivityItemProvider.h</key>
<data>
Expand Down Expand Up @@ -118,7 +118,7 @@
</data>
<key>Info.plist</key>
<data>
gsXVV71Iinv6p15rd8kujQgnBfc=
kShkvdMqkEKab1C74+lBaeM3Bsk=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down Expand Up @@ -198,14 +198,14 @@
<dict>
<key>hash2</key>
<data>
aOPDI53SkKBlc20iJ9dY3u0zDK3naimM2Ld1t4NHTRo=
7KCfdg9Tx2TQEn4o1BXZhQMqUu/C0oT6Pauk0AVvffk=
</data>
</dict>
<key>Headers/BNCServerRequestQueue.h</key>
<dict>
<key>hash2</key>
<data>
fa2rqfjQD3tPOOE5/nenQ0Pbm+yJtyBtMbPKINYRbfM=
zhSw9k3ayW3pglwwvvN1eb1/ie0Gm4nM07skeIQG7D8=
</data>
</dict>
<key>Headers/BNCServerResponse.h</key>
Expand All @@ -219,7 +219,7 @@
<dict>
<key>hash2</key>
<data>
/W0qiND2TrQxP9Z9oPoNV/1Y468+kUc8KYBULlRP44E=
/aXn0iERBer0iGGBTQsfr8438HyynfnySoPMokwDrAw=
</data>
</dict>
<key>Headers/BranchActivityItemProvider.h</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

@interface BNCServerRequest : NSObject <NSSecureCoding>

@property (nonatomic, copy, readwrite) NSString *requestUUID;
@property (nonatomic, copy, readwrite) NSNumber *requestCreationTimeStamp;

- (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key callback:(BNCServerCallback)callback;
- (void)processResponse:(BNCServerResponse *)response error:(NSError *)error;
- (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableDictionary *)dict;
+ (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate;
@end
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

@interface BNCServerRequestQueue : NSObject

@property (assign, nonatomic) BOOL processArchivedOpens;

- (void)enqueue:(BNCServerRequest *)request;
- (BNCServerRequest *)dequeue;
- (BNCServerRequest *)peek;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,9 @@ Sets a custom base URL for all calls to the Branch API.
Key-value pairs to be included in the metadata on every request.
@param key String to be included in request metadata
@param value Object to be included in request metadata
@param value Value to be included in request metadata
*/
- (void)setRequestMetadataKey:(NSString *)key value:(nullable id)value;
- (void)setRequestMetadataKey:(NSString *)key value:(nullable NSString *)value;

/**
Disables the Branch SDK from tracking the user. This is useful for GDPR privacy compliance.
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

@interface BNCServerRequest : NSObject <NSSecureCoding>

@property (nonatomic, copy, readwrite) NSString *requestUUID;
@property (nonatomic, copy, readwrite) NSNumber *requestCreationTimeStamp;

- (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key callback:(BNCServerCallback)callback;
- (void)processResponse:(BNCServerResponse *)response error:(NSError *)error;
- (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableDictionary *)dict;
+ (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate;
@end
Loading

0 comments on commit 84c3931

Please sign in to comment.