From 522e65ed682c1c453c4e48c67ba13f2f33fb8568 Mon Sep 17 00:00:00 2001 From: Sungwoon Park Date: Sat, 9 May 2020 06:55:59 +0900 Subject: [PATCH] :arrow_up: RxCocoa version up (#368) --- RIBs.podspec | 3 +- ios/tutorials/tutorial1/Podfile | 2 +- .../TicTacToe.xcodeproj/project.pbxproj | 22 ++-------- ios/tutorials/tutorial2/Podfile | 2 +- .../TicTacToe.xcodeproj/project.pbxproj | 44 ++++--------------- ios/tutorials/tutorial3-completed/Podfile | 2 +- .../TicTacToe.xcodeproj/project.pbxproj | 22 ++-------- ios/tutorials/tutorial3/Podfile | 2 +- .../TicTacToe.xcodeproj/project.pbxproj | 22 ++-------- ios/tutorials/tutorial4-completed/Podfile | 2 +- .../TicTacToe.xcodeproj/project.pbxproj | 22 ++-------- ios/tutorials/tutorial4/Podfile | 2 +- .../TicTacToe.xcodeproj/project.pbxproj | 22 ++-------- 13 files changed, 36 insertions(+), 133 deletions(-) diff --git a/RIBs.podspec b/RIBs.podspec index b651ebed8..3ab091bbc 100644 --- a/RIBs.podspec +++ b/RIBs.podspec @@ -9,7 +9,8 @@ RIBs is the cross-platform architecture behind many mobile apps at Uber. This ar s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE.txt' } s.author = { 'uber' => 'mobile-open-source@uber.com' } s.source = { :git => 'https://github.com/uber/RIBs.git', :tag => 'v' + s.version.to_s } - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '8.0'¥ + s.swift_version = '5.0' s.source_files = 'ios/RIBs/Classes/**/*' s.dependency 'RxSwift', '~> 5.1' s.dependency 'RxRelay', '~> 5.1' diff --git a/ios/tutorials/tutorial1/Podfile b/ios/tutorials/tutorial1/Podfile index a3a0f2464..980817e94 100644 --- a/ios/tutorials/tutorial1/Podfile +++ b/ios/tutorials/tutorial1/Podfile @@ -6,5 +6,5 @@ inhibit_all_warnings! target 'TicTacToe' do pod 'RIBs', :path => '../../../' pod 'SnapKit', '~> 4.0.0' - pod 'RxCocoa', '~> 4.0.0' + pod 'RxCocoa', '~> 5.1' end diff --git a/ios/tutorials/tutorial1/TicTacToe.xcodeproj/project.pbxproj b/ios/tutorials/tutorial1/TicTacToe.xcodeproj/project.pbxproj index 43f3c1beb..0c8b1ff37 100644 --- a/ios/tutorials/tutorial1/TicTacToe.xcodeproj/project.pbxproj +++ b/ios/tutorials/tutorial1/TicTacToe.xcodeproj/project.pbxproj @@ -144,7 +144,6 @@ E9894B471F972CC500688FCB /* Frameworks */, E9894B481F972CC500688FCB /* Resources */, 01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */, - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -207,9 +206,10 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", ); @@ -217,12 +217,13 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */ = { @@ -243,21 +244,6 @@ 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; }; - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/tutorials/tutorial2/Podfile b/ios/tutorials/tutorial2/Podfile index 330b0a4a1..d8c8d777e 100644 --- a/ios/tutorials/tutorial2/Podfile +++ b/ios/tutorials/tutorial2/Podfile @@ -6,7 +6,7 @@ inhibit_all_warnings! target 'TicTacToe' do pod 'RIBs', :path => '../../../' pod 'SnapKit', '~> 4.0.0' - pod 'RxCocoa', '~> 4.0.0' + pod 'RxCocoa', '~> 5.1' end target 'TicTacToeTests' do diff --git a/ios/tutorials/tutorial2/TicTacToe.xcodeproj/project.pbxproj b/ios/tutorials/tutorial2/TicTacToe.xcodeproj/project.pbxproj index 42e5c4208..0f044421f 100644 --- a/ios/tutorials/tutorial2/TicTacToe.xcodeproj/project.pbxproj +++ b/ios/tutorials/tutorial2/TicTacToe.xcodeproj/project.pbxproj @@ -231,7 +231,6 @@ E9894B471F972CC500688FCB /* Frameworks */, E9894B481F972CC500688FCB /* Resources */, 01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */, - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -251,7 +250,6 @@ E9C86D841FA3586500B61DF6 /* Frameworks */, E9C86D851FA3586500B61DF6 /* Resources */, 5FD5ECF53320E2E0DAFD17C5 /* [CP] Embed Pods Frameworks */, - F080D36DAB36458C01EE92DE /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -328,9 +326,10 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", ); @@ -338,12 +337,13 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 5FD5ECF53320E2E0DAFD17C5 /* [CP] Embed Pods Frameworks */ = { @@ -352,18 +352,20 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TicTacToeTests/Pods-TicTacToeTests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TicTacToeTests/Pods-TicTacToeTests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToeTests/Pods-TicTacToeTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToeTests/Pods-TicTacToeTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */ = { @@ -384,21 +386,6 @@ 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; }; - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; EFEB812EF3BA56E9928EF4E3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -417,21 +404,6 @@ 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; }; - F080D36DAB36458C01EE92DE /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToeTests/Pods-TicTacToeTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/tutorials/tutorial3-completed/Podfile b/ios/tutorials/tutorial3-completed/Podfile index a3a0f2464..980817e94 100644 --- a/ios/tutorials/tutorial3-completed/Podfile +++ b/ios/tutorials/tutorial3-completed/Podfile @@ -6,5 +6,5 @@ inhibit_all_warnings! target 'TicTacToe' do pod 'RIBs', :path => '../../../' pod 'SnapKit', '~> 4.0.0' - pod 'RxCocoa', '~> 4.0.0' + pod 'RxCocoa', '~> 5.1' end diff --git a/ios/tutorials/tutorial3-completed/TicTacToe.xcodeproj/project.pbxproj b/ios/tutorials/tutorial3-completed/TicTacToe.xcodeproj/project.pbxproj index 34d4b285c..b432bd0a6 100644 --- a/ios/tutorials/tutorial3-completed/TicTacToe.xcodeproj/project.pbxproj +++ b/ios/tutorials/tutorial3-completed/TicTacToe.xcodeproj/project.pbxproj @@ -230,7 +230,6 @@ E9894B471F972CC500688FCB /* Frameworks */, E9894B481F972CC500688FCB /* Resources */, 01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */, - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -293,9 +292,10 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", ); @@ -303,12 +303,13 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */ = { @@ -329,21 +330,6 @@ 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; }; - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/tutorials/tutorial3/Podfile b/ios/tutorials/tutorial3/Podfile index a3a0f2464..980817e94 100644 --- a/ios/tutorials/tutorial3/Podfile +++ b/ios/tutorials/tutorial3/Podfile @@ -6,5 +6,5 @@ inhibit_all_warnings! target 'TicTacToe' do pod 'RIBs', :path => '../../../' pod 'SnapKit', '~> 4.0.0' - pod 'RxCocoa', '~> 4.0.0' + pod 'RxCocoa', '~> 5.1' end diff --git a/ios/tutorials/tutorial3/TicTacToe.xcodeproj/project.pbxproj b/ios/tutorials/tutorial3/TicTacToe.xcodeproj/project.pbxproj index e9ea9ff39..6e9d0e1f5 100644 --- a/ios/tutorials/tutorial3/TicTacToe.xcodeproj/project.pbxproj +++ b/ios/tutorials/tutorial3/TicTacToe.xcodeproj/project.pbxproj @@ -219,7 +219,6 @@ E9894B471F972CC500688FCB /* Frameworks */, E9894B481F972CC500688FCB /* Resources */, 01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */, - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -282,9 +281,10 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", ); @@ -292,12 +292,13 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */ = { @@ -318,21 +319,6 @@ 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; }; - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/tutorials/tutorial4-completed/Podfile b/ios/tutorials/tutorial4-completed/Podfile index a3a0f2464..980817e94 100644 --- a/ios/tutorials/tutorial4-completed/Podfile +++ b/ios/tutorials/tutorial4-completed/Podfile @@ -6,5 +6,5 @@ inhibit_all_warnings! target 'TicTacToe' do pod 'RIBs', :path => '../../../' pod 'SnapKit', '~> 4.0.0' - pod 'RxCocoa', '~> 4.0.0' + pod 'RxCocoa', '~> 5.1' end diff --git a/ios/tutorials/tutorial4-completed/TicTacToe.xcodeproj/project.pbxproj b/ios/tutorials/tutorial4-completed/TicTacToe.xcodeproj/project.pbxproj index c097cbbbe..9c9f2d5d8 100644 --- a/ios/tutorials/tutorial4-completed/TicTacToe.xcodeproj/project.pbxproj +++ b/ios/tutorials/tutorial4-completed/TicTacToe.xcodeproj/project.pbxproj @@ -310,7 +310,6 @@ E9894B471F972CC500688FCB /* Frameworks */, E9894B481F972CC500688FCB /* Resources */, 01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */, - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -373,9 +372,10 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", ); @@ -383,12 +383,13 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */ = { @@ -409,21 +410,6 @@ 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; }; - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/tutorials/tutorial4/Podfile b/ios/tutorials/tutorial4/Podfile index a3a0f2464..980817e94 100644 --- a/ios/tutorials/tutorial4/Podfile +++ b/ios/tutorials/tutorial4/Podfile @@ -6,5 +6,5 @@ inhibit_all_warnings! target 'TicTacToe' do pod 'RIBs', :path => '../../../' pod 'SnapKit', '~> 4.0.0' - pod 'RxCocoa', '~> 4.0.0' + pod 'RxCocoa', '~> 5.1' end diff --git a/ios/tutorials/tutorial4/TicTacToe.xcodeproj/project.pbxproj b/ios/tutorials/tutorial4/TicTacToe.xcodeproj/project.pbxproj index fc19c24f3..5de64de2b 100644 --- a/ios/tutorials/tutorial4/TicTacToe.xcodeproj/project.pbxproj +++ b/ios/tutorials/tutorial4/TicTacToe.xcodeproj/project.pbxproj @@ -307,7 +307,6 @@ E9894B471F972CC500688FCB /* Frameworks */, E9894B481F972CC500688FCB /* Resources */, 01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */, - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -370,9 +369,10 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", ); @@ -380,12 +380,13 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */ = { @@ -406,21 +407,6 @@ 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; }; - D0E4ECFC9A8F9EAE85892FE7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */