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

Jump to bottom

Carthage support #212

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Carthage support #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
235f950
Add a Cartfile describing iOS framework dependencies
pivotal-ivan-rodriguez Apr 14, 2016
90d3d4b
Import SocketRocket using the angle-bracket syntax
Apr 14, 2016
f5ec8b6
Add a iOS framework target. This enables usage with Carthage
Apr 14, 2016
9237126
Added missing headers to the umbrella header
pivotal-ivan-rodriguez Apr 18, 2016
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ dist
xcodebuild.log
Pods/Documentation
*.xccheckout

Carthage/
2 changes: 2 additions & 0 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "tonymillion/Reachability" "master"
Copy link
Contributor

@hamchapman hamchapman May 10, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

There's a warning about this as part of its repo: https://github.com/tonymillion/Reachability#warning-there-have-been-reports-of-apps-being-rejected-when-reachability-is-used-in-a-framework-the-only-solution-to-this-so-far-is-to-rename-the-class

Is this necessary as part of the Cartfile or is it something that could optionally be added for those who want to add it to their projects?

github "square/SocketRocket"
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not too familiar with Carthage but should this dependency be fixed here?

Copy link
Contributor

Choose a reason for hiding this comment

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

It gets fixed in the Cartfile.resolved file I think https://github.com/pivotal-ivan-rodriguez/libPusher/blob/ios-framework/Cartfile.resolved#L2

2 changes: 2 additions & 0 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "tonymillion/Reachability" "c4d225a479379f9998dbd5b55070427373d20574"
github "square/SocketRocket" "0.5.0"
2 changes: 1 addition & 1 deletion Library/PTPusherConnection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import "PTPusherConnection.h"
#import "PTPusherEvent.h"
#define SR_ENABLE_LOG
#import "SRWebSocket.h"
#import <SocketRocket/SRWebSocket.h>
#import "PTJSON.h"

NSString *const PTPusherConnectionEstablishedEvent = @"pusher:connection_established";
Expand Down
2 changes: 1 addition & 1 deletion Library/PTPusherMockConnection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import "PTPusherMockConnection.h"
#import "PTJSON.h"
#import "PTPusherEvent.h"
#import "SRWebSocket.h"
#import <SocketRocket/SRWebSocket.h>

@interface PTPusherConnection () <SRWebSocketDelegate>
@end
Expand Down
3 changes: 3 additions & 0 deletions Library/Pusher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
#import <Pusher/PTPusherEvent.h>
#import <Pusher/PTPusherAPI.h>
#import <Pusher/PTPusherEventDispatcher.h>
#import <Pusher/PTPusher+Testing.h>
#import <Pusher/PTPusherErrors.h>
#import <Pusher/PTPusherMockConnection.h>
Copy link
Contributor

Choose a reason for hiding this comment

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

These imports weren't previously necessary; why are they necessary now? Particularly the mock and testing stuff which should only be needed in tests.

318 changes: 304 additions & 14 deletions libPusher.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions libPusher.xcodeproj/xcshareddata/xcschemes/Pusher-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AEDD6EA21CBFEACE008FCE9B"
BuildableName = "Pusher.framework"
BlueprintName = "Pusher-iOS"
ReferencedContainer = "container:libPusher.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AEDD6EA21CBFEACE008FCE9B"
BuildableName = "Pusher.framework"
BlueprintName = "Pusher-iOS"
ReferencedContainer = "container:libPusher.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AEDD6EA21CBFEACE008FCE9B"
BuildableName = "Pusher.framework"
BlueprintName = "Pusher-iOS"
ReferencedContainer = "container:libPusher.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
2 changes: 1 addition & 1 deletion libPusher.xcodeproj/xcshareddata/xcschemes/Sample App (iOS).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand Down