rebases callback queue changes

.travis.yml

@@ -1,7 +1,7 @@
 language: swift
 
 os: osx
-osx_image: xcode10.2
+osx_image: xcode11.4
 cache:
   bundler: true
   directories:

CHANGELOG.md

@@ -5,6 +5,9 @@ This product uses [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [1.2.1]
+* Pinned back Starscream version to fix Carthage build issue
+
 ## [1.2.0](https://github.com/davidstump/SwiftPhoenixClient/compare/1.1.2...1.2.0)
 * [#153](https://github.com/davidstump/SwiftPhoenixClient/pull/153): Added ability to pass a closure when initializing a `Socket` to dynamically change `params` when reconnecting
 * Fixed Package.swift and updated it to use latest Starscream
@@ -89,7 +92,8 @@ Thanks to @murphb52 and @ALucasVanDongen for helping with some of the developmen
 * Mirror [Phoenix.js](https://hexdocs.pm/phoenix/js/) more closely
 
 
-[Unreleased]: https://github.com/davidstump/SwiftPhoenixClient/compare/0.9.3...HEAD
+[Unreleased]: https://github.com/davidstump/SwiftPhoenixClient/compare/1.2.1...HEAD
+[1.2.1]: https://github.com/davidstump/SwiftPhoenixClient/compare/1.2.0...1.2.1
 [0.9.3]: https://github.com/davidstump/SwiftPhoenixClient/compare/0.9.2...0.9.3
 [0.9.2]: https://github.com/davidstump/SwiftPhoenixClient/compare/0.9.1...0.9.2
 [0.9.1]: https://github.com/davidstump/SwiftPhoenixClient/compare/0.9.0...0.9.1

Cartfile

@@ -1 +1 @@
-github "daltoniam/Starscream" >= 3.1.0
+github "daltoniam/Starscream" ~> 3.1.0

Example/ChatExample.xcodeproj/project.pbxproj

@@ -190,23 +190,19 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftPhoenixClient/SwiftPhoenixClient.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftPhoenixClient.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

Example/Podfile.lock

@@ -1,13 +1,13 @@
 PODS:
   - Starscream (3.1.0)
-  - SwiftPhoenixClient (1.1.0):
+  - SwiftPhoenixClient (1.2.0):
     - Starscream (~> 3.1.0)
 
 DEPENDENCIES:
   - SwiftPhoenixClient (from `../`)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - Starscream
 
 EXTERNAL SOURCES:
@@ -16,8 +16,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Starscream: 08172b481e145289c4930cb567230fb55897cfa4
-  SwiftPhoenixClient: be3d46472ac61bf228783b1ef38de91904056cc7
+  SwiftPhoenixClient: ba22ba809b345522afe478817d7cb51ee3d49365
 
 PODFILE CHECKSUM: 4cce157fd27e110208bf7e296e2c2a19a1d68505
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.9.1