Skip to content

Commit

Permalink
Update SocketRocket to 0.5.1.
Browse files Browse the repository at this point in the history
Restructure Podfile in general.
  • Loading branch information
hamchapman committed Jun 29, 2016
1 parent aa62b7d commit 82c12c7
Show file tree
Hide file tree
Showing 37 changed files with 3,035 additions and 2,919 deletions.
68 changes: 48 additions & 20 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,60 @@
# unless you want to install new development dependencies as the Pods directory
# is part of the source tree.
#
platform :ios, :deployment_target => '6.0'
platform :ios, deployment_target: '6.0'

inhibit_all_warnings!

pod 'Reachability', '~> 3.1'
pod 'SocketRocket', '~> 0.4.1'
pod 'ReactiveCocoa', '~> 2.1'
def import_pods
pod 'Reachability', '~> 3.1'
pod 'SocketRocket', '~> 0.5.0'
pod 'ReactiveCocoa', '~> 2.1'
end

def import_test_pods
pod 'Kiwi', '~> 2.3'
pod 'OHHTTPStubs', '~> 3.0'
end


target 'libPusher' do
import_pods
end

target 'libPusher_ReactiveExtensions.a' do
import_pods
end

target 'SampleApp' do
import_pods
end

target 'UnitTests' do
import_pods
import_test_pods
end

target 'Functional Specs' do
import_pods
import_test_pods
end


post_install do |installer|
# we don't want to link static lib to the icucore dylib or it will fail to build
builds = ["debug", "release"]
builds = ['debug', 'release']

builds.each do |build|
config_file_path = File.join("Pods", "Target Support Files", "Pods", "Pods.#{build}.xcconfig")

File.open("#{build}_config.tmp", "w") do |io|
io << File.read(config_file_path).gsub(/-licucore/, '')
installer.pods_project.targets.each do |target|
config_file_path = File.join("Pods", "Target Support Files", "#{target.name}", "#{target.name}.#{build}.xcconfig")

if File.file? config_file_path
File.open("#{build}_config.tmp", "w") do |io|
io << File.read(config_file_path).gsub(/-l"icucore"/, '')
end

FileUtils.mv("#{build}_config.tmp", config_file_path)
end

FileUtils.mv("#{build}_config.tmp", config_file_path)
end
end
end

target :specs, :exclusive => true do
link_with ['Functional Specs', 'UnitTests']

pod 'Kiwi', '~> 2.3'
pod 'OHHTTPStubs', '~> 3.0'
end
end
10 changes: 6 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,22 @@ PODS:
- ReactiveCocoa/no-arc (2.5)
- ReactiveCocoa/UI (2.5):
- ReactiveCocoa/Core
- SocketRocket (0.4.1)
- SocketRocket (0.5.1)

DEPENDENCIES:
- Kiwi (~> 2.3)
- OHHTTPStubs (~> 3.0)
- Reachability (~> 3.1)
- ReactiveCocoa (~> 2.1)
- SocketRocket (~> 0.4.1)
- SocketRocket (~> 0.5.0)

SPEC CHECKSUMS:
Kiwi: f49c9d54b28917df5928fe44968a39ed198cb8a8
OHHTTPStubs: 8cf0cfe6f34f13fc88fdf5b2a1b2c2536e8c0261
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
ReactiveCocoa: e2db045570aa97c695e7aa97c2bcab222ae51f4a
SocketRocket: ee0b5c34182d37bb4f1f8d628bbe737718126daa
SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531

COCOAPODS: 0.38.2
PODFILE CHECKSUM: a316588001408a9e5cccaa3af4afd997e6d03a38

COCOAPODS: 1.0.1
10 changes: 6 additions & 4 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4,526 changes: 2,565 additions & 1,961 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Loading

0 comments on commit 82c12c7

Please sign in to comment.