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..2af314c5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -28,9 +28,17 @@ DEPENDENCIES: - OCMock - SocketRocket (= 0.4.2) +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - AFNetworking + - OCMock + - SocketRocket + SPEC CHECKSUMS: AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60 OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835 SocketRocket: ffe08119b00ef982f6c37052a4705a057c8494ad -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: b3a3a58c75f13f9a520b6c950906fdd364953a26 + +COCOAPODS: 1.5.3 diff --git a/SignalR.Client.ObjC.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SignalR.Client.ObjC.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/SignalR.Client.ObjC.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SignalR.Client.ObjC.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SignalR.Client.ObjC.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..0c67376e --- /dev/null +++ b/SignalR.Client.ObjC.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + + diff --git a/SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj/project.pbxproj b/SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj/project.pbxproj index a8f1b0cc..6246c7d6 100644 --- a/SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj/project.pbxproj +++ b/SignalR.Client.ObjC/SignalR.Client.ObjC.xcodeproj/project.pbxproj @@ -53,7 +53,6 @@ 39302A211C69768D0061C6B5 /* SRServerSentEventsTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 3920786115AF13F6009B959E /* SRServerSentEventsTransport.m */; }; 39302A221C69768D0061C6B5 /* SRWebSocketTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 39AF0D7D17138E3800E13E6E /* SRWebSocketTransport.m */; }; 39302A231C6976A30061C6B5 /* SRSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 3920783615AF13F6009B959E /* SRSubscription.m */; }; - 39302A271C6977800061C6B5 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 39302A251C6977800061C6B5 /* Info.plist */; }; 39302A281C6977800061C6B5 /* SignalR.h in Headers */ = {isa = PBXBuildFile; fileRef = 39302A261C6977800061C6B5 /* SignalR.h */; }; 39302A381C6978AC0061C6B5 /* SignalR.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39302A2E1C6978AB0061C6B5 /* SignalR.framework */; }; 39302A451C6979E10061C6B5 /* SRHubConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 3920782715AF13F6009B959E /* SRHubConnection.m */; }; @@ -522,12 +521,12 @@ isa = PBXNativeTarget; buildConfigurationList = 39302A051C6974C20061C6B5 /* Build configuration list for PBXNativeTarget "SignalR.Client.OSX" */; buildPhases = ( + 759DD48E5A906D4D2714F305 /* [CP] Check Pods Manifest.lock */, BE773CA6D603623DBCDFD6AF /* Check Pods Manifest.lock */, 393029EF1C6974C10061C6B5 /* Sources */, 393029F01C6974C10061C6B5 /* Frameworks */, 393029F11C6974C10061C6B5 /* Headers */, 393029F21C6974C10061C6B5 /* Resources */, - 7C5BAF419D1DB75581A41B87 /* Copy Pods Resources */, ); buildRules = ( ); @@ -542,12 +541,13 @@ isa = PBXNativeTarget; buildConfigurationList = 39302A081C6974C20061C6B5 /* Build configuration list for PBXNativeTarget "SignalR.Client.OSXTests" */; buildPhases = ( + 29F8A99392528EEAD6A859C3 /* [CP] Check Pods Manifest.lock */, 537C4819A81E84FE2982C1CF /* Check Pods Manifest.lock */, 393029F91C6974C20061C6B5 /* Sources */, 393029FA1C6974C20061C6B5 /* Frameworks */, 393029FB1C6974C20061C6B5 /* Resources */, 67E90B84652BAD667E4611D1 /* Embed Pods Frameworks */, - 0B029DDB5BC07F36BE28C47C /* Copy Pods Resources */, + ED3F4313A751EA87E66F745B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -563,12 +563,12 @@ isa = PBXNativeTarget; buildConfigurationList = 39302A3F1C6978AC0061C6B5 /* Build configuration list for PBXNativeTarget "SignalR.Client.iOS" */; buildPhases = ( + A48F4A4D58939ECEEB8E687E /* [CP] Check Pods Manifest.lock */, 42E081C85DE4F4916D0F3D75 /* Check Pods Manifest.lock */, 39302A291C6978AB0061C6B5 /* Sources */, 39302A2A1C6978AB0061C6B5 /* Frameworks */, 39302A2B1C6978AB0061C6B5 /* Headers */, 39302A2C1C6978AB0061C6B5 /* Resources */, - 796268F885EFEC8F1356854A /* Copy Pods Resources */, ); buildRules = ( ); @@ -583,12 +583,13 @@ isa = PBXNativeTarget; buildConfigurationList = 39302A421C6978AC0061C6B5 /* Build configuration list for PBXNativeTarget "SignalR.Client.iOSTests" */; buildPhases = ( + EF8CD3D9CD825628C4319223 /* [CP] Check Pods Manifest.lock */, 21C56E6B6FDFA0220435E7AD /* Check Pods Manifest.lock */, 39302A331C6978AC0061C6B5 /* Sources */, 39302A341C6978AC0061C6B5 /* Frameworks */, 39302A351C6978AC0061C6B5 /* Resources */, 2AC719B5534D658A6E1038BA /* Embed Pods Frameworks */, - 1A11AFB25C13B6568AF7E084 /* Copy Pods Resources */, + 239C11727851DAB652DA48A3 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -648,7 +649,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 39302A271C6977800061C6B5 /* Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -676,49 +676,67 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0B029DDB5BC07F36BE28C47C /* Copy Pods Resources */ = { + 21C56E6B6FDFA0220435E7AD /* Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests-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; }; - 1A11AFB25C13B6568AF7E084 /* Copy Pods Resources */ = { + 239C11727851DAB652DA48A3 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", + "${BUILT_PRODUCTS_DIR}/SocketRocket-iOS/SocketRocket.framework", + "${BUILT_PRODUCTS_DIR}/OCMock-iOS/OCMock.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( ); - name = "Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SocketRocket.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests-resources.sh\"\n"; + 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; }; - 21C56E6B6FDFA0220435E7AD /* Check Pods Manifest.lock */ = { + 29F8A99392528EEAD6A859C3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests-checkManifestLockResult.txt", ); 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 = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 2AC719B5534D658A6E1038BA /* Embed Pods Frameworks */ = { @@ -781,34 +799,48 @@ 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 */ = { + 759DD48E5A906D4D2714F305 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Copy Pods Resources"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-SignalR.Client.OSX-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.iOS/Pods-SignalR.Client.iOS-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 7C5BAF419D1DB75581A41B87 /* Copy Pods Resources */ = { + A48F4A4D58939ECEEB8E687E /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Copy Pods Resources"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-SignalR.Client.iOS-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.OSX/Pods-SignalR.Client.OSX-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; BE773CA6D603623DBCDFD6AF /* Check Pods Manifest.lock */ = { @@ -826,6 +858,54 @@ 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; }; + ED3F4313A751EA87E66F745B /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${SRCROOT}/../Pods/Target Support Files/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests/Pods-SignalR.Client.OSX-SignalR.Client.OSXTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/AFNetworking-93a4f461/AFNetworking.framework", + "${BUILT_PRODUCTS_DIR}/SocketRocket-macOS/SocketRocket.framework", + "${BUILT_PRODUCTS_DIR}/OCMock-macOS/OCMock.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SocketRocket.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + 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; + }; + EF8CD3D9CD825628C4319223 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-SignalR.Client.iOS-SignalR.Client.iOSTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */