Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Carthage support #639

Merged
merged 12 commits into from
Oct 31, 2017
Merged

Carthage support #639

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5b08784
Update Cartfile
ricardopereira Oct 13, 2017
b4c3560
Use Frameworks internally
ricardopereira Oct 13, 2017
0993a2f
SocketRocket `send` method as been deprecated
ricardopereira Oct 13, 2017
43a9bef
Removed warnings
ricardopereira Oct 13, 2017
1cfda1e
SRWebSocketDelegate doesn't support nullable arguments anymore
ricardopereira Oct 13, 2017
3aff7ad
Disable "SEPARATE_STRIP"
ricardopereira Oct 18, 2017
12e4162
Add Runpath Search paths
ricardopereira Oct 18, 2017
ff43be7
ARTEventEmitter+Private shouldn't be used in public headers
ricardopereira Oct 19, 2017
5e5de53
Update Project settings to v8.3.3
ricardopereira Oct 19, 2017
00921a1
Use modular import directives in public headers and remove compatibil…
ricardopereira Oct 19, 2017
0b6310e
Fix msgpack import for CocoaPods
ricardopereira Oct 20, 2017
5960d99
Fix CocoaPod support
ricardopereira Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "facebook/SocketRocket" "master"
github "whitesmith/msgpack-objective-C" "disable-modules"
github "rvi/msgpack-objective-C" "master"
github "ably-forks/KSCrash" "1.15.8-ably-1"
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "ably-forks/KSCrash" "1.15.8-ably-1"
github "facebook/SocketRocket" "28035e1a98a427853e4038ff1b70479fa8374cfa"
github "whitesmith/msgpack-objective-C" "82982c70f42462fb95fe4e93427b8fbd3cd290c4"
github "rvi/msgpack-objective-C" "ad0a627becfd27ca45dfa6684b3fc79f058f5ce9"
5 changes: 5 additions & 0 deletions Source/ARTRest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@
#import "ARTRealtime+Private.h"
#import "ARTSentry.h"

#if COCOAPODS
#import <KSCrashAblyFork/KSCrash.h>
#else
// Carthage
#import <KSCrash/KSCrash.h>
#endif

@interface ARTRest () {
__block NSUInteger _tokenErrorRetries;
Expand Down
11 changes: 10 additions & 1 deletion Source/ARTSentry.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,20 @@
#import "ARTNSDate+ARTUtil.h"
#import "ARTDefault.h"
#import "ARTCrypto+Private.h"
#import "ARTNSArray+ARTFunctional.h"

#if COCOAPODS
#import <KSCrashAblyFork/KSCrash.h>
#import <KSCrashAblyFork/KSCrashInstallation+Private.h>
#import <KSCrashAblyFork/KSCrashMonitorType.h>
#import <KSCrashAblyFork/NSData+GZip.h>
#else
// Carthage
#import <KSCrash/KSCrash.h>
#import <KSCrash/KSCrashInstallation+Private.h>
#import <KSCrash/KSCrashMonitorType.h>
#import <KSCrash/NSData+GZip.h>
#import "ARTNSArray+ARTFunctional.h"
#endif

NSString* ART_hexMemoryAddress(id addr) {
if (addr && [addr isKindOfClass:[NSString class]]) {
Expand Down
5 changes: 5 additions & 0 deletions Source/ARTWebSocketTransport.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@ - (void)send:(NSData *)data withSource:(id)decodedObject {
if ([decodedObject isKindOfClass:[ARTProtocolMessage class]]) {
[_protocolMessagesLogger info:@"send %@", [decodedObject description]];
}
#if COCOAPODS
[self.websocket send:data];
#else
// https://github.com/facebook/SocketRocket/issues/542
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow :(

[self.websocket sendData:data error:nil];
#endif
}
}

Expand Down