From 4620a6d7b14d4cec3494674f7aabf58f4891b929 Mon Sep 17 00:00:00 2001 From: Tatyana Leshchenok Date: Thu, 14 Jul 2016 11:25:35 +0300 Subject: [PATCH 1/4] update Pods to 1.0.1 version --- Podfile | 4 +- Podfile.lock | 4 +- .../project.pbxproj | 60 +++++++++---------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/Podfile b/Podfile index 7ed01693..30db80c0 100644 --- a/Podfile +++ b/Podfile @@ -1,4 +1,4 @@ -xcodeproj 'SignalR.Client.ObjC/SignalR.Client.ObjC' +project 'SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj' workspace 'SignalR.Client.ObjC' target "SignalR.Client.iOS" do @@ -23,4 +23,4 @@ target :"SignalR.Client.OSX" do target :"SignalR.Client.OSXTests" do pod 'OCMock' end -end \ No newline at end of file +end diff --git a/Podfile.lock b/Podfile.lock index 3c53754a..abad0645 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -33,4 +33,6 @@ SPEC CHECKSUMS: OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835 SocketRocket: ffe08119b00ef982f6c37052a4705a057c8494ad -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: b3a3a58c75f13f9a520b6c950906fdd364953a26 + +COCOAPODS: 1.0.1 diff --git a/SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj/project.pbxproj b/SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj/project.pbxproj index a8f1b0cc..629006de 100644 --- a/SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj/project.pbxproj +++ b/SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj/project.pbxproj @@ -522,12 +522,12 @@ isa = PBXNativeTarget; buildConfigurationList = 39302A051C6974C20061C6B5 /* Build configuration list for PBXNativeTarget "SignalR.Client.OSX" */; buildPhases = ( - BE773CA6D603623DBCDFD6AF /* Check Pods Manifest.lock */, + BE773CA6D603623DBCDFD6AF /* [CP] Check Pods Manifest.lock */, 393029EF1C6974C10061C6B5 /* Sources */, 393029F01C6974C10061C6B5 /* Frameworks */, 393029F11C6974C10061C6B5 /* Headers */, 393029F21C6974C10061C6B5 /* Resources */, - 7C5BAF419D1DB75581A41B87 /* Copy Pods Resources */, + 7C5BAF419D1DB75581A41B87 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -542,12 +542,12 @@ isa = PBXNativeTarget; buildConfigurationList = 39302A081C6974C20061C6B5 /* Build configuration list for PBXNativeTarget "SignalR.Client.OSXTests" */; buildPhases = ( - 537C4819A81E84FE2982C1CF /* Check Pods Manifest.lock */, + 537C4819A81E84FE2982C1CF /* [CP] Check Pods Manifest.lock */, 393029F91C6974C20061C6B5 /* Sources */, 393029FA1C6974C20061C6B5 /* Frameworks */, 393029FB1C6974C20061C6B5 /* Resources */, - 67E90B84652BAD667E4611D1 /* Embed Pods Frameworks */, - 0B029DDB5BC07F36BE28C47C /* Copy Pods Resources */, + 67E90B84652BAD667E4611D1 /* [CP] Embed Pods Frameworks */, + 0B029DDB5BC07F36BE28C47C /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -563,12 +563,12 @@ isa = PBXNativeTarget; buildConfigurationList = 39302A3F1C6978AC0061C6B5 /* Build configuration list for PBXNativeTarget "SignalR.Client.iOS" */; buildPhases = ( - 42E081C85DE4F4916D0F3D75 /* Check Pods Manifest.lock */, + 42E081C85DE4F4916D0F3D75 /* [CP] Check Pods Manifest.lock */, 39302A291C6978AB0061C6B5 /* Sources */, 39302A2A1C6978AB0061C6B5 /* Frameworks */, 39302A2B1C6978AB0061C6B5 /* Headers */, 39302A2C1C6978AB0061C6B5 /* Resources */, - 796268F885EFEC8F1356854A /* Copy Pods Resources */, + 796268F885EFEC8F1356854A /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -583,12 +583,12 @@ isa = PBXNativeTarget; buildConfigurationList = 39302A421C6978AC0061C6B5 /* Build configuration list for PBXNativeTarget "SignalR.Client.iOSTests" */; buildPhases = ( - 21C56E6B6FDFA0220435E7AD /* Check Pods Manifest.lock */, + 21C56E6B6FDFA0220435E7AD /* [CP] Check Pods Manifest.lock */, 39302A331C6978AC0061C6B5 /* Sources */, 39302A341C6978AC0061C6B5 /* Frameworks */, 39302A351C6978AC0061C6B5 /* Resources */, - 2AC719B5534D658A6E1038BA /* Embed Pods Frameworks */, - 1A11AFB25C13B6568AF7E084 /* Copy Pods Resources */, + 2AC719B5534D658A6E1038BA /* [CP] Embed Pods Frameworks */, + 1A11AFB25C13B6568AF7E084 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -676,14 +676,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0B029DDB5BC07F36BE28C47C /* Copy Pods Resources */ = { + 0B029DDB5BC07F36BE28C47C /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -691,14 +691,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 1A11AFB25C13B6568AF7E084 /* Copy Pods Resources */ = { + 1A11AFB25C13B6568AF7E084 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -706,14 +706,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 21C56E6B6FDFA0220435E7AD /* Check Pods Manifest.lock */ = { + 21C56E6B6FDFA0220435E7AD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -721,14 +721,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 2AC719B5534D658A6E1038BA /* Embed Pods Frameworks */ = { + 2AC719B5534D658A6E1038BA /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -736,14 +736,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 42E081C85DE4F4916D0F3D75 /* Check Pods Manifest.lock */ = { + 42E081C85DE4F4916D0F3D75 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -751,14 +751,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 537C4819A81E84FE2982C1CF /* Check Pods Manifest.lock */ = { + 537C4819A81E84FE2982C1CF /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -766,14 +766,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 67E90B84652BAD667E4611D1 /* Embed Pods Frameworks */ = { + 67E90B84652BAD667E4611D1 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -781,14 +781,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 796268F885EFEC8F1356854A /* Copy Pods Resources */ = { + 796268F885EFEC8F1356854A /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -796,14 +796,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.iOS/Pods-SignalR.Client.iOS-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 7C5BAF419D1DB75581A41B87 /* Copy Pods Resources */ = { + 7C5BAF419D1DB75581A41B87 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -811,14 +811,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.OSX/Pods-SignalR.Client.OSX-resources.sh\"\n"; showEnvVarsInLog = 0; }; - BE773CA6D603623DBCDFD6AF /* Check Pods Manifest.lock */ = { + BE773CA6D603623DBCDFD6AF /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; From f7252c949cbb4ecdec6d09b6ce80167985f11972 Mon Sep 17 00:00:00 2001 From: Tatyana Leshchenok Date: Thu, 14 Jul 2016 11:25:58 +0300 Subject: [PATCH 2/4] update example pods to 1.0.1 version --- Example/Podfile | 4 +- Example/Podfile.lock | 14 ++- .../project.pbxproj | 104 +++++++++--------- 3 files changed, 62 insertions(+), 60 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index 15675c9a..8ba42143 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,4 @@ -xcodeproj 'SignalR.Client.ObjC Example' +project 'SignalR.Client.ObjC Example.xcodeproj' workspace '../SignalR.Client.ObjC' target "OS X Example" do @@ -13,4 +13,4 @@ target "iOS Example" do platform :ios, '9.0' pod 'SignalR-ObjC', :path => '..' -end \ No newline at end of file +end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 1b4a70f1..c145e982 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -20,9 +20,9 @@ PODS: - AFNetworking/UIKit (2.6.3): - AFNetworking/NSURLConnection - AFNetworking/NSURLSession - - SignalR-ObjC (2.0.1): - - SignalR-ObjC/Core (= 2.0.1) - - SignalR-ObjC/Core (2.0.1): + - SignalR-ObjC (2.0.2): + - SignalR-ObjC/Core (= 2.0.2) + - SignalR-ObjC/Core (2.0.2): - AFNetworking (~> 2.0) - SocketRocket (~> 0.4) - SocketRocket (0.4.2) @@ -32,11 +32,13 @@ DEPENDENCIES: EXTERNAL SOURCES: SignalR-ObjC: - :path: ".." + :path: .. SPEC CHECKSUMS: AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60 - SignalR-ObjC: 7ec4f7ba12750224e94229f3653df3f1204955c6 + SignalR-ObjC: 3913aa201f436cf21226e0016ca6c7e94265921a SocketRocket: ffe08119b00ef982f6c37052a4705a057c8494ad -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 3f8c8cf23eda999198a8c28081991f8fd0c6bf36 + +COCOAPODS: 1.0.1 diff --git a/Example/SignalR.Client.ObjC Example.xcodeproj/project.pbxproj b/Example/SignalR.Client.ObjC Example.xcodeproj/project.pbxproj index d7ce677c..e282f141 100644 --- a/Example/SignalR.Client.ObjC Example.xcodeproj/project.pbxproj +++ b/Example/SignalR.Client.ObjC Example.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 0BC4445E9F0BCDDA73CB8B3F /* Pods_iOS_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF208B46B7B9A63647750FFF /* Pods_iOS_Example.framework */; }; 390E4CE71C8524F7001A14A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 390E4CE61C8524F7001A14A2 /* Assets.xcassets */; }; 390E4CF01C8651BE001A14A2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 390E4CEF1C8651BE001A14A2 /* main.m */; }; 390E4CF31C8651BE001A14A2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 390E4CF21C8651BE001A14A2 /* AppDelegate.m */; }; @@ -33,11 +32,14 @@ 397B377F1C851B7600BC5E36 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 397B377E1C851B7600BC5E36 /* main.m */; }; 397B37821C851B7600BC5E36 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 397B37811C851B7600BC5E36 /* ViewController.m */; }; 397B37871C851B7600BC5E36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 397B37851C851B7600BC5E36 /* Main.storyboard */; }; - E559DDE611A5B689B3BC0D00 /* Pods_OS_X_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E325A97A02BC27ED400E17C /* Pods_OS_X_Example.framework */; }; + A70B7787A8E35904373DE812 /* Pods_OS_X_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C871F4E186C2EFD52B4540 /* Pods_OS_X_Example.framework */; }; + C6AF5739CAC25F3E25C4ED83 /* Pods_iOS_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AC44EE3DDFFD33B30CA5450 /* Pods_iOS_Example.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 13E460A7DC4DF4F5F54A23F2 /* Pods-iOS Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Example/Pods-iOS Example.debug.xcconfig"; sourceTree = ""; }; + 0AC44EE3DDFFD33B30CA5450 /* Pods_iOS_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 26E8D05D82E32CC66BB1B504 /* Pods-OS X Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OS X Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-OS X Example/Pods-OS X Example.release.xcconfig"; sourceTree = ""; }; + 351410B2687BEEB900315599 /* Pods-iOS Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Example/Pods-iOS Example.debug.xcconfig"; sourceTree = ""; }; 390E4CE61C8524F7001A14A2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 390E4CEC1C8651BE001A14A2 /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 390E4CEF1C8651BE001A14A2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -78,11 +80,9 @@ 397B37861C851B7600BC5E36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 397B37881C851B7600BC5E36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 397B378C1C851BDC00BC5E36 /* Podfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Podfile; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 5E325A97A02BC27ED400E17C /* Pods_OS_X_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OS_X_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BEF9A811D7FC720FD6FD931E /* Pods-OS X Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OS X Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OS X Example/Pods-OS X Example.debug.xcconfig"; sourceTree = ""; }; - BF208B46B7B9A63647750FFF /* Pods_iOS_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E26BC6F7118BE2BC74A4950B /* Pods-iOS Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Example/Pods-iOS Example.release.xcconfig"; sourceTree = ""; }; - E3A0A8AB55C503A140E0D367 /* Pods-OS X Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OS X Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-OS X Example/Pods-OS X Example.release.xcconfig"; sourceTree = ""; }; + 48C871F4E186C2EFD52B4540 /* Pods_OS_X_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OS_X_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B14FDC6BBB609FF310064F31 /* Pods-OS X Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OS X Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OS X Example/Pods-OS X Example.debug.xcconfig"; sourceTree = ""; }; + D7738421A4B843F2B9B07C68 /* Pods-iOS Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS Example/Pods-iOS Example.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -90,7 +90,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0BC4445E9F0BCDDA73CB8B3F /* Pods_iOS_Example.framework in Frameworks */, + C6AF5739CAC25F3E25C4ED83 /* Pods_iOS_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -98,13 +98,24 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E559DDE611A5B689B3BC0D00 /* Pods_OS_X_Example.framework in Frameworks */, + A70B7787A8E35904373DE812 /* Pods_OS_X_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 2D50D8F0F6B1BE2C946E271D /* Pods */ = { + isa = PBXGroup; + children = ( + B14FDC6BBB609FF310064F31 /* Pods-OS X Example.debug.xcconfig */, + 26E8D05D82E32CC66BB1B504 /* Pods-OS X Example.release.xcconfig */, + 351410B2687BEEB900315599 /* Pods-iOS Example.debug.xcconfig */, + D7738421A4B843F2B9B07C68 /* Pods-iOS Example.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; 390E4CED1C8651BE001A14A2 /* iOS Example */ = { isa = PBXGroup; children = ( @@ -164,8 +175,8 @@ 397B37791C851B7600BC5E36 /* OS X Example */, 390E4CED1C8651BE001A14A2 /* iOS Example */, 397B37781C851B7600BC5E36 /* Products */, - 45EFDEE793A918C8077B6250 /* Pods */, - CD94A5EFD11D2DBCCD4AF9EE /* Frameworks */, + 2D50D8F0F6B1BE2C946E271D /* Pods */, + FED0B681FD3D3BB1EB2821B6 /* Frameworks */, ); sourceTree = ""; }; @@ -201,22 +212,11 @@ name = "Supporting Files"; sourceTree = ""; }; - 45EFDEE793A918C8077B6250 /* Pods */ = { - isa = PBXGroup; - children = ( - BEF9A811D7FC720FD6FD931E /* Pods-OS X Example.debug.xcconfig */, - E3A0A8AB55C503A140E0D367 /* Pods-OS X Example.release.xcconfig */, - 13E460A7DC4DF4F5F54A23F2 /* Pods-iOS Example.debug.xcconfig */, - E26BC6F7118BE2BC74A4950B /* Pods-iOS Example.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; - CD94A5EFD11D2DBCCD4AF9EE /* Frameworks */ = { + FED0B681FD3D3BB1EB2821B6 /* Frameworks */ = { isa = PBXGroup; children = ( - 5E325A97A02BC27ED400E17C /* Pods_OS_X_Example.framework */, - BF208B46B7B9A63647750FFF /* Pods_iOS_Example.framework */, + 48C871F4E186C2EFD52B4540 /* Pods_OS_X_Example.framework */, + 0AC44EE3DDFFD33B30CA5450 /* Pods_iOS_Example.framework */, ); name = Frameworks; sourceTree = ""; @@ -228,12 +228,12 @@ isa = PBXNativeTarget; buildConfigurationList = 390E4D051C8651BE001A14A2 /* Build configuration list for PBXNativeTarget "iOS Example" */; buildPhases = ( - 950F4196E14D50E8207AD8C9 /* Check Pods Manifest.lock */, + 15B06A9A96004228AD2EAB3B /* [CP] Check Pods Manifest.lock */, 390E4CE81C8651BE001A14A2 /* Sources */, 390E4CE91C8651BE001A14A2 /* Frameworks */, 390E4CEA1C8651BE001A14A2 /* Resources */, - E156E217CE46D12BD3F75E3F /* Embed Pods Frameworks */, - C4CD6112A0F48F719E647646 /* Copy Pods Resources */, + A92C051A21DD63DF16BF1610 /* [CP] Embed Pods Frameworks */, + 308BF72A9BFE45E12B9664B9 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -248,12 +248,12 @@ isa = PBXNativeTarget; buildConfigurationList = 397B378B1C851B7600BC5E36 /* Build configuration list for PBXNativeTarget "OS X Example" */; buildPhases = ( - 05EC2FA48D8BAE899EE27BC9 /* Check Pods Manifest.lock */, + C9C17F2DF64852679EDEE1A8 /* [CP] Check Pods Manifest.lock */, 397B37731C851B7600BC5E36 /* Sources */, 397B37741C851B7600BC5E36 /* Frameworks */, 397B37751C851B7600BC5E36 /* Resources */, - C67A0DF692BF6CB074FAFE40 /* Embed Pods Frameworks */, - AD3B132FAE58BC21F60D0B6D /* Copy Pods Resources */, + DA013E2B43766F8A364CAF79 /* [CP] Embed Pods Frameworks */, + E02981805E3ABC325DF757F2 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -322,14 +322,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 05EC2FA48D8BAE899EE27BC9 /* Check Pods Manifest.lock */ = { + 15B06A9A96004228AD2EAB3B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -337,59 +337,59 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 950F4196E14D50E8207AD8C9 /* Check Pods Manifest.lock */ = { + 308BF72A9BFE45E12B9664B9 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Example/Pods-iOS Example-resources.sh\"\n"; showEnvVarsInLog = 0; }; - AD3B132FAE58BC21F60D0B6D /* Copy Pods Resources */ = { + A92C051A21DD63DF16BF1610 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OS X Example/Pods-OS X Example-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Example/Pods-iOS Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - C4CD6112A0F48F719E647646 /* Copy Pods Resources */ = { + C9C17F2DF64852679EDEE1A8 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Example/Pods-iOS Example-resources.sh\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - C67A0DF692BF6CB074FAFE40 /* Embed Pods Frameworks */ = { + DA013E2B43766F8A364CAF79 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -397,19 +397,19 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OS X Example/Pods-OS X Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E156E217CE46D12BD3F75E3F /* Embed Pods Frameworks */ = { + E02981805E3ABC325DF757F2 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS Example/Pods-iOS Example-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OS X Example/Pods-OS X Example-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -481,7 +481,7 @@ /* Begin XCBuildConfiguration section */ 390E4D031C8651BE001A14A2 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 13E460A7DC4DF4F5F54A23F2 /* Pods-iOS Example.debug.xcconfig */; + baseConfigurationReference = 351410B2687BEEB900315599 /* Pods-iOS Example.debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -531,7 +531,7 @@ }; 390E4D041C8651BE001A14A2 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E26BC6F7118BE2BC74A4950B /* Pods-iOS Example.release.xcconfig */; + baseConfigurationReference = D7738421A4B843F2B9B07C68 /* Pods-iOS Example.release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -587,7 +587,7 @@ }; 397B37891C851B7600BC5E36 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BEF9A811D7FC720FD6FD931E /* Pods-OS X Example.debug.xcconfig */; + baseConfigurationReference = B14FDC6BBB609FF310064F31 /* Pods-OS X Example.debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -637,7 +637,7 @@ }; 397B378A1C851B7600BC5E36 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E3A0A8AB55C503A140E0D367 /* Pods-OS X Example.release.xcconfig */; + baseConfigurationReference = 26E8D05D82E32CC66BB1B504 /* Pods-OS X Example.release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; From 3a4177e47944c7da52f56f9cb7ef51ef58c5bd17 Mon Sep 17 00:00:00 2001 From: Tatyana Leshchenok Date: Thu, 14 Jul 2016 11:31:05 +0300 Subject: [PATCH 3/4] pass error data from SRHubResult to NSError --- SignalR.Client/Hubs/SRHubProxy.h | 3 ++- SignalR.Client/Hubs/SRHubProxy.m | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/SignalR.Client/Hubs/SRHubProxy.h b/SignalR.Client/Hubs/SRHubProxy.h index a2be733f..7643dc10 100644 --- a/SignalR.Client/Hubs/SRHubProxy.h +++ b/SignalR.Client/Hubs/SRHubProxy.h @@ -23,7 +23,8 @@ #import #import "SRHubConnectionInterface.h" #import "SRHubProxyInterface.h" - + +extern NSString * const kErrorData; /** * An `SRHubProxy` object provides support for SignalR Hubs */ diff --git a/SignalR.Client/Hubs/SRHubProxy.m b/SignalR.Client/Hubs/SRHubProxy.m index 141f2376..d2797c58 100644 --- a/SignalR.Client/Hubs/SRHubProxy.m +++ b/SignalR.Client/Hubs/SRHubProxy.m @@ -28,6 +28,8 @@ #import "SRHubConnectionInterface.h" #import "SRConnectionInterface.h" +NSString * const kErrorData = @"SRErrorData"; + @interface SRHubProxy () @property (assign, nonatomic, readonly) id connection; @@ -125,6 +127,9 @@ - (void)invoke:(NSString *)method withArgs:(NSArray *)args completionHandler:(vo NSError *error = [NSError errorWithDomain:[NSString stringWithFormat:NSLocalizedString(@"com.SignalR.SignalR-ObjC.%@",@""),NSStringFromClass([self class])] code:0 userInfo:userInfo]; + if (result.errorData) { + userInfo[kErrorData] = result.errorData; + } [_connection didReceiveError:error]; if (block != nil) { block(nil, error); From f8e0edc3ff4866e3eaa3869e75c7aa065f1c54d2 Mon Sep 17 00:00:00 2001 From: Tatyana Leshchenok Date: Fri, 12 Aug 2016 15:49:49 +0300 Subject: [PATCH 4/4] fix for adding error data --- SignalR.Client/Hubs/SRHubProxy.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SignalR.Client/Hubs/SRHubProxy.m b/SignalR.Client/Hubs/SRHubProxy.m index d2797c58..cda3206e 100644 --- a/SignalR.Client/Hubs/SRHubProxy.m +++ b/SignalR.Client/Hubs/SRHubProxy.m @@ -124,12 +124,12 @@ - (void)invoke:(NSString *)method withArgs:(NSArray *)args completionHandler:(vo NSMutableDictionary *userInfo = [NSMutableDictionary dictionary]; userInfo[NSLocalizedFailureReasonErrorKey] = NSInternalInconsistencyException; userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"%@", result.error]; - NSError *error = [NSError errorWithDomain:[NSString stringWithFormat:NSLocalizedString(@"com.SignalR.SignalR-ObjC.%@",@""),NSStringFromClass([self class])] - code:0 - userInfo:userInfo]; if (result.errorData) { userInfo[kErrorData] = result.errorData; } + NSError *error = [NSError errorWithDomain:[NSString stringWithFormat:NSLocalizedString(@"com.SignalR.SignalR-ObjC.%@",@""),NSStringFromClass([self class])] + code:0 + userInfo:userInfo]; [_connection didReceiveError:error]; if (block != nil) { block(nil, error);