From 418f1aa2bb09c5876724d156722f8105c0c8adb3 Mon Sep 17 00:00:00 2001 From: sergdort Date: Tue, 27 Nov 2018 20:12:38 +0000 Subject: [PATCH] update pods --- .../project.pbxproj | 12 +++ Podfile.lock | 40 ++++---- Podfile.save | 95 ------------------- 3 files changed, 35 insertions(+), 112 deletions(-) delete mode 100644 Podfile.save diff --git a/CleanArchitectureRxSwift.xcodeproj/project.pbxproj b/CleanArchitectureRxSwift.xcodeproj/project.pbxproj index 08e44b48..c0d7535f 100644 --- a/CleanArchitectureRxSwift.xcodeproj/project.pbxproj +++ b/CleanArchitectureRxSwift.xcodeproj/project.pbxproj @@ -1485,6 +1485,7 @@ inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-CleanArchitectureRxSwift/Pods-CleanArchitectureRxSwift-frameworks.sh", "${BUILT_PRODUCTS_DIR}/QueryKit/QueryKit.framework", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework", @@ -1496,6 +1497,7 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QueryKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework", @@ -1534,6 +1536,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-DomainTests/Pods-DomainTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/RxBlocking/RxBlocking.framework", @@ -1541,6 +1544,7 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxBlocking.framework", @@ -1576,6 +1580,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-NetworkPlatformTests/Pods-NetworkPlatformTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/RxBlocking/RxBlocking.framework", @@ -1585,6 +1590,7 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxBlocking.framework", @@ -1640,6 +1646,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-CoreDataPlatformTests/Pods-CoreDataPlatformTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/RxBlocking/RxBlocking.framework", @@ -1648,6 +1655,7 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxBlocking.framework", @@ -1666,6 +1674,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-CleanArchitectureRxSwiftTests/Pods-CleanArchitectureRxSwiftTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/RxBlocking/RxBlocking.framework", @@ -1673,6 +1682,7 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxBlocking.framework", @@ -1726,6 +1736,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-RealmPlatformTests/Pods-RealmPlatformTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/RxBlocking/RxBlocking.framework", @@ -1737,6 +1748,7 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxBlocking.framework", diff --git a/Podfile.lock b/Podfile.lock index 12b45362..5da6d865 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -2,25 +2,29 @@ PODS: - Alamofire (4.7.3) - Nimble (7.3.1) - QueryKit (0.13.0) - - Realm (3.10.0): - - Realm/Headers (= 3.10.0) - - Realm/Headers (3.10.0) - - RealmSwift (3.10.0): - - Realm (= 3.10.0) + - Realm (3.11.1): + - Realm/Headers (= 3.11.1) + - Realm/Headers (3.11.1) + - RealmSwift (3.11.1): + - Realm (= 3.11.1) - RxAlamofire (4.3.0): - RxAlamofire/Core (= 4.3.0) - RxAlamofire/Core (4.3.0): - Alamofire (~> 4.5) - RxSwift (~> 4) - - RxBlocking (4.3.1): + - RxAtomic (4.4.0) + - RxBlocking (4.4.0): + - RxAtomic (~> 4.4) - RxSwift (~> 4.0) - - RxCocoa (4.3.1): + - RxCocoa (4.4.0): - RxSwift (~> 4.0) - - RxRealm (0.7.5): + - RxRealm (0.7.6): - RealmSwift (~> 3.0) - RxSwift (~> 4.0) - - RxSwift (4.3.1) - - RxTest (4.3.1): + - RxSwift (4.4.0): + - RxAtomic (~> 4.4) + - RxTest (4.4.0): + - RxAtomic (~> 4.4) - RxSwift (~> 4.0) DEPENDENCIES: @@ -44,6 +48,7 @@ SPEC REPOS: - Realm - RealmSwift - RxAlamofire + - RxAtomic - RxBlocking - RxCocoa - RxRealm @@ -54,14 +59,15 @@ SPEC CHECKSUMS: Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568 Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae QueryKit: 406c42b9b4eb5f8dab380a9e5bd9ef656542d1f4 - Realm: 85ab9e4f779d66f6e9ffeb118dc25b7f130c96ac - RealmSwift: 69121c8b86d0ae005fb779efdb10e606732e1c74 + Realm: 037c5919b9ceb59d6beed5d3b031096856b119b3 + RealmSwift: c9580133e73ef40ed340401af2dbc9a5790dfea7 RxAlamofire: 09624d0f2d48ed8b686e4eb4cf68e28cbd2df556 - RxBlocking: 64c051285261ca2339481e91b5f70eb06b03660a - RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635 - RxRealm: a6c6c0a07cb61f34209969ca6657734edfdfff30 - RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4 - RxTest: ea97a208826906f3904c0debdd09575ebcbfe216 + RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f + RxBlocking: 138ad53217434444d6eeeb4fb406a45431d92e31 + RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749 + RxRealm: 5379eddd74f8d617ca7681d1f8d144af25b432b0 + RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973 + RxTest: 19d03286bdc0a3aaea5d61d4cde31fdf4bb8a5ba PODFILE CHECKSUM: 8587d87d88ab80217209b0a3b29c2c6130be8755 diff --git a/Podfile.save b/Podfile.save deleted file mode 100644 index 51e92cd5..00000000 --- a/Podfile.save +++ /dev/null @@ -1,95 +0,0 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' - -def rx_swift - pod 'RxSwift', '~> 3.0' -end - -def rx_cocoa - pod 'RxCocoa', '~> 3.0' -end - -def test_pods - pod 'RxTest', '~> 3.0' - pod 'RxBlocking', '~> 3.0' - pod 'Nimble' -end - - -target 'CleanArchitectureRxSwift' do - # Comment the next line if you're not using Swift and don't want to use dynamic frameworks - use_frameworks! - rx_cocoa - rx_swift - pod 'QueryKit' - target 'CleanArchitectureRxSwiftTests' do - inherit! :search_paths - test_pods - end - -end - -target 'CoreDataPlatform' do - # Comment the next line if you're not using Swift and don't want to use dynamic frameworks - use_frameworks! - rx_swift - pod 'QueryKit' - target 'CoreDataPlatformTests' do - inherit! :search_paths - test_pods - end - -end - -target 'Domain' do - # Comment the next line if you're not using Swift and don't want to use dynamic frameworks - use_frameworks! - rx_swift - - target 'DomainTests' do - inherit! :search_paths - test_pods - end - -end - -target 'Network' do - # Comment the next line if you're not using Swift and don't want to use dynamic frameworks - use_frameworks! - rx_swift - pod 'Alamofire' - pod 'RxAlamofire' - pod 'ObjectMapper' - pod 'AlamofireObjectMapper' - - target 'NetworkTests' do - inherit! :search_paths - test_pods - end - -end - -target 'RealmPlatform' do - # Comment the next line if you're not using Swift and don't want to use dynamic frameworks - use_frameworks! - rx_swift - pod 'RxRealm' - pod 'QueryKit' - pod 'RealmSwift' - pod 'Realm' - - target 'RealmPlatformTests' do - inherit! :search_paths - test_pods - end - -end -ost_install do |installer| - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - if config.name == 'Debug' || target.name == 'RxSwift' - config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['-D', 'TRACE_RESOURCES'] - end - end - end -end