Merge pull request #185 from hamchapman/update-socket-rocket-to-0.4

Update socket rocket to 0.4
pusher · Sep 21, 2015 · ce20b12 · ce20b12
2 parents be9e3cf + 793280e
commit ce20b12
Show file tree

Hide file tree

Showing 1,184 changed files with 10,498 additions and 10,045 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+# 1.6.1 - September 2015
+
+* Update SocketRocket to 0.4.1 (#181)
+* Update Gemfile to use more recent version of Cocoapods
+* Changed iOS deployment target to 6.0
+
 # 1.6 - March 2015
 
 * Swift and 64-bit compatibility

diff --git a/Gemfile b/Gemfile
@@ -15,7 +15,7 @@ group :building do
   gem "rest-client"
   gem "xcodebuild-rb", :git => "git://github.com/lukeredpath/xcodebuild-rb.git"
   gem "xcodeproj"
-  gem "cocoapods", '~> 0.28.0'
+  gem "cocoapods", ">=0.32.1"
   gem "github-downloads", :git => "git://github.com/lukeredpath/github-downloads.git"
   gem "osx_keychain"
   gem "ios-sim-test", :git => "git://github.com/alloy/ios-sim-test.git"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -31,26 +31,40 @@ GEM
     RubyInline (3.12.3)
       ZenTest (~> 4.3)
     ZenTest (4.10.1)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    claide (0.4.0)
-    cocoapods (0.28.0)
-      activesupport (>= 3.2.15, < 4)
-      claide (~> 0.4.0)
-      cocoapods-core (= 0.28.0)
-      cocoapods-downloader (~> 0.2.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    claide (0.9.1)
+    cocoapods (0.38.2)
+      activesupport (>= 3.2.15)
+      claide (~> 0.9.1)
+      cocoapods-core (= 0.38.2)
+      cocoapods-downloader (~> 0.9.1)
+      cocoapods-plugins (~> 0.4.2)
+      cocoapods-stats (~> 0.5.3)
+      cocoapods-trunk (~> 0.6.1)
+      cocoapods-try (~> 0.4.5)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      json_pure (~> 1.8)
-      open4 (~> 1.3)
-      xcodeproj (~> 0.14.1)
-    cocoapods-core (0.28.0)
-      activesupport (>= 3.2.15, < 4)
+      molinillo (~> 0.3.1)
+      nap (~> 0.8)
+      xcodeproj (~> 0.26.3)
+    cocoapods-core (0.38.2)
+      activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
-      json (~> 1.8)
-      nap (~> 0.5)
-    cocoapods-downloader (0.2.0)
+      nap (~> 0.8.0)
+    cocoapods-downloader (0.9.3)
+    cocoapods-plugins (0.4.2)
+      nap
+    cocoapods-stats (0.5.3)
+      nap (~> 0.8)
+    cocoapods-trunk (0.6.4)
+      nap (>= 0.8, < 2.0)
+      netrc (= 0.7.8)
+    cocoapods-try (0.4.5)
     colored (1.2)
     daemons (1.1.9)
     escape (0.0.4)
@@ -59,16 +73,16 @@ GEM
     highline (1.6.21)
     hirb (0.7.2)
     httpclient (2.3.4.1)
-    i18n (0.6.11)
-    json (1.8.1)
-    json_pure (1.8.1)
+    i18n (0.7.0)
+    json (1.8.3)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
     mime-types (2.3)
-    multi_json (1.10.1)
+    minitest (5.8.0)
+    molinillo (0.3.1)
+    multi_json (1.11.2)
     nap (0.8.0)
-    netrc (0.7.7)
-    open4 (1.3.4)
+    netrc (0.7.8)
     osx_keychain (1.0.0)
       RubyInline (~> 3)
     pusher (0.12.0)
@@ -78,7 +92,7 @@ GEM
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
-    rake (10.3.2)
+    rake (10.4.2)
     rest-client (1.7.1)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
@@ -94,19 +108,22 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
+    thread_safe (0.3.5)
     tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     uuid (2.3.7)
       macaddr (~> 1.0)
-    xcodeproj (0.14.1)
-      activesupport (~> 3.0)
+    xcodeproj (0.26.3)
+      activesupport (>= 3)
+      claide (~> 0.9.1)
       colored (~> 1.2)
-      rake
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 0.28.0)
+  cocoapods (>= 0.32.1)
   github-downloads!
   ios-sim-test!
   json

diff --git a/Podfile b/Podfile
@@ -4,23 +4,27 @@
 # unless you want to install new development dependencies as the Pods directory
 # is part of the source tree.
 #
-platform :ios, :deployment_target => '5.0'
+platform :ios, :deployment_target => '6.0'
 
 inhibit_all_warnings!
 
 pod 'Reachability', '~> 3.1'
-pod 'SocketRocket', '0.3.1-beta2'
+pod 'SocketRocket', '~> 0.4.1'
 pod 'ReactiveCocoa', '~> 2.1'
 
 post_install do |installer|
   # we don't want to link static lib to the icucore dylib or it will fail to build
-  config_file_path = File.join("Pods", "Pods.xcconfig")
+  builds = ["debug", "release"]
 
-  File.open("config.tmp", "w") do |io|
-    io << File.read(config_file_path).gsub(/-licucore/, '')
+  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/, '')
+      end
+
+      FileUtils.mv("#{build}_config.tmp", config_file_path)
   end
-
-  FileUtils.mv("config.tmp", config_file_path)
 end
 
 target :specs, :exclusive => true do

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,27 +1,30 @@
 PODS:
-  - Kiwi (2.3.0)
-  - OHHTTPStubs (3.0.2)
-  - Reachability (3.1.1)
-  - ReactiveCocoa (2.1.7):
-    - ReactiveCocoa/Core
-    - ReactiveCocoa/no-arc
-  - ReactiveCocoa/Core (2.1.7):
+  - Kiwi (2.4.0)
+  - OHHTTPStubs (3.1.12):
+    - OHHTTPStubs/Core (= 3.1.12)
+  - OHHTTPStubs/Core (3.1.12)
+  - Reachability (3.2)
+  - ReactiveCocoa (2.5):
+    - ReactiveCocoa/UI (= 2.5)
+  - ReactiveCocoa/Core (2.5):
     - ReactiveCocoa/no-arc
-  - ReactiveCocoa/no-arc (2.1.7)
-  - SocketRocket (0.3.1-beta2)
+  - ReactiveCocoa/no-arc (2.5)
+  - ReactiveCocoa/UI (2.5):
+    - ReactiveCocoa/Core
+  - SocketRocket (0.4.1)
 
 DEPENDENCIES:
-  - Kiwi (~> 2.2)
+  - Kiwi (~> 2.3)
   - OHHTTPStubs (~> 3.0)
   - Reachability (~> 3.1)
   - ReactiveCocoa (~> 2.1)
-  - SocketRocket (= 0.3.1-beta2)
+  - SocketRocket (~> 0.4.1)
 
 SPEC CHECKSUMS:
-  Kiwi: 54bece5b35564d9b8e03c608d926f1a22fcfc589
-  OHHTTPStubs: 655f246d7be70b7d6a198170b592cb5b6d389307
-  Reachability: 8e9635e3cb4f98e7f825e51147f677ecc694d0e7
-  ReactiveCocoa: be6d4fb0a2598980d61336a5de3c370a1ddd5f0f
-  SocketRocket: 79a68ae186063c65e1fe6f638b1ae2927aa5f304
+  Kiwi: f49c9d54b28917df5928fe44968a39ed198cb8a8
+  OHHTTPStubs: 8cf0cfe6f34f13fc88fdf5b2a1b2c2536e8c0261
+  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
+  ReactiveCocoa: e2db045570aa97c695e7aa97c2bcab222ae51f4a
+  SocketRocket: ee0b5c34182d37bb4f1f8d628bbe737718126daa
 
-COCOAPODS: 0.33.1
+COCOAPODS: 0.38.2
diff --git a/Pods/BuildHeaders/Kiwi/KWAfterAllNode.h b/Pods/BuildHeaders/Kiwi/KWAfterAllNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWAfterEachNode.h b/Pods/BuildHeaders/Kiwi/KWAfterEachNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWAny.h b/Pods/BuildHeaders/Kiwi/KWAny.h
diff --git a/Pods/BuildHeaders/Kiwi/KWAsyncVerifier.h b/Pods/BuildHeaders/Kiwi/KWAsyncVerifier.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeBetweenMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeBetweenMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeEmptyMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeEmptyMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeIdenticalToMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeIdenticalToMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeKindOfClassMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeKindOfClassMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeMemberOfClassMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeMemberOfClassMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeSubclassOfClassMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeSubclassOfClassMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeTrueMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeTrueMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeWithinMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeWithinMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeZeroMatcher.h b/Pods/BuildHeaders/Kiwi/KWBeZeroMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeforeAllNode.h b/Pods/BuildHeaders/Kiwi/KWBeforeAllNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBeforeEachNode.h b/Pods/BuildHeaders/Kiwi/KWBeforeEachNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBlock.h b/Pods/BuildHeaders/Kiwi/KWBlock.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBlockNode.h b/Pods/BuildHeaders/Kiwi/KWBlockNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWBlockRaiseMatcher.h b/Pods/BuildHeaders/Kiwi/KWBlockRaiseMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWCallSite.h b/Pods/BuildHeaders/Kiwi/KWCallSite.h
diff --git a/Pods/BuildHeaders/Kiwi/KWCaptureSpy.h b/Pods/BuildHeaders/Kiwi/KWCaptureSpy.h
diff --git a/Pods/BuildHeaders/Kiwi/KWChangeMatcher.h b/Pods/BuildHeaders/Kiwi/KWChangeMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWConformToProtocolMatcher.h b/Pods/BuildHeaders/Kiwi/KWConformToProtocolMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWContainMatcher.h b/Pods/BuildHeaders/Kiwi/KWContainMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWContainStringMatcher.h b/Pods/BuildHeaders/Kiwi/KWContainStringMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWContextNode.h b/Pods/BuildHeaders/Kiwi/KWContextNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWCountType.h b/Pods/BuildHeaders/Kiwi/KWCountType.h
diff --git a/Pods/BuildHeaders/Kiwi/KWDeviceInfo.h b/Pods/BuildHeaders/Kiwi/KWDeviceInfo.h
diff --git a/Pods/BuildHeaders/Kiwi/KWEqualMatcher.h b/Pods/BuildHeaders/Kiwi/KWEqualMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWExample.h b/Pods/BuildHeaders/Kiwi/KWExample.h
diff --git a/Pods/BuildHeaders/Kiwi/KWExampleDelegate.h b/Pods/BuildHeaders/Kiwi/KWExampleDelegate.h
diff --git a/Pods/BuildHeaders/Kiwi/KWExampleNode.h b/Pods/BuildHeaders/Kiwi/KWExampleNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWExampleNodeVisitor.h b/Pods/BuildHeaders/Kiwi/KWExampleNodeVisitor.h
diff --git a/Pods/BuildHeaders/Kiwi/KWExampleSuite.h b/Pods/BuildHeaders/Kiwi/KWExampleSuite.h
diff --git a/Pods/BuildHeaders/Kiwi/KWExampleSuiteBuilder.h b/Pods/BuildHeaders/Kiwi/KWExampleSuiteBuilder.h
diff --git a/Pods/BuildHeaders/Kiwi/KWExistVerifier.h b/Pods/BuildHeaders/Kiwi/KWExistVerifier.h
diff --git a/Pods/BuildHeaders/Kiwi/KWExpectationType.h b/Pods/BuildHeaders/Kiwi/KWExpectationType.h
diff --git a/Pods/BuildHeaders/Kiwi/KWFailure.h b/Pods/BuildHeaders/Kiwi/KWFailure.h
diff --git a/Pods/BuildHeaders/Kiwi/KWFormatter.h b/Pods/BuildHeaders/Kiwi/KWFormatter.h
diff --git a/Pods/BuildHeaders/Kiwi/KWFutureObject.h b/Pods/BuildHeaders/Kiwi/KWFutureObject.h
diff --git a/Pods/BuildHeaders/Kiwi/KWGenericMatchEvaluator.h b/Pods/BuildHeaders/Kiwi/KWGenericMatchEvaluator.h
diff --git a/Pods/BuildHeaders/Kiwi/KWGenericMatcher.h b/Pods/BuildHeaders/Kiwi/KWGenericMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWGenericMatchingAdditions.h b/Pods/BuildHeaders/Kiwi/KWGenericMatchingAdditions.h
diff --git a/Pods/BuildHeaders/Kiwi/KWHaveMatcher.h b/Pods/BuildHeaders/Kiwi/KWHaveMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWHaveValueMatcher.h b/Pods/BuildHeaders/Kiwi/KWHaveValueMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWInequalityMatcher.h b/Pods/BuildHeaders/Kiwi/KWInequalityMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWIntercept.h b/Pods/BuildHeaders/Kiwi/KWIntercept.h
diff --git a/Pods/BuildHeaders/Kiwi/KWInvocationCapturer.h b/Pods/BuildHeaders/Kiwi/KWInvocationCapturer.h
diff --git a/Pods/BuildHeaders/Kiwi/KWItNode.h b/Pods/BuildHeaders/Kiwi/KWItNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWLet.h b/Pods/BuildHeaders/Kiwi/KWLet.h
diff --git a/Pods/BuildHeaders/Kiwi/KWLetNode.h b/Pods/BuildHeaders/Kiwi/KWLetNode.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMatchVerifier.h b/Pods/BuildHeaders/Kiwi/KWMatchVerifier.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMatcher.h b/Pods/BuildHeaders/Kiwi/KWMatcher.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMatcherFactory.h b/Pods/BuildHeaders/Kiwi/KWMatcherFactory.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMatchers.h b/Pods/BuildHeaders/Kiwi/KWMatchers.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMatching.h b/Pods/BuildHeaders/Kiwi/KWMatching.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMessagePattern.h b/Pods/BuildHeaders/Kiwi/KWMessagePattern.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMessageSpying.h b/Pods/BuildHeaders/Kiwi/KWMessageSpying.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMessageTracker.h b/Pods/BuildHeaders/Kiwi/KWMessageTracker.h
diff --git a/Pods/BuildHeaders/Kiwi/KWMock.h b/Pods/BuildHeaders/Kiwi/KWMock.h
diff --git a/Pods/BuildHeaders/Kiwi/KWNilMatcher.h b/Pods/BuildHeaders/Kiwi/KWNilMatcher.h