From 484ed94a9b237fb047ed34a5d8aba215f576b547 Mon Sep 17 00:00:00 2001 From: Maxim Tsvetkov <777.maxxx@gmail.com> Date: Mon, 12 Nov 2018 17:15:25 +0100 Subject: [PATCH] Change Rx dependencies version from '~> 4.3.1' to '~> 4.3' (#59) * - Change Rx dependencies version from '~> 4.3.1' to '~> 4.3' in podspec and podfile - Update pods * Change Rx dependencies version from '~> 4.3.1' to '~> 4.3' in cartfile --- Cartfile | 2 +- Cartfile.resolved | 2 +- Example/Podfile | 2 +- Example/Podfile.lock | 25 ++++++++++++--------- Example/ReCaptcha.xcodeproj/project.pbxproj | 4 ++++ ReCaptcha.podspec | 2 +- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Cartfile b/Cartfile index 6c7e3a8..4056d09 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveX/RxSwift" ~> 4.3.1 +github "ReactiveX/RxSwift" ~> 4.3 diff --git a/Cartfile.resolved b/Cartfile.resolved index b34f3f7..57537f1 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ReactiveX/RxSwift" "4.3.1" +github "ReactiveX/RxSwift" "4.3" diff --git a/Example/Podfile b/Example/Podfile index 427b0c1..17aac5f 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -5,7 +5,7 @@ inhibit_all_warnings! target 'ReCaptcha_Example' do pod 'ReCaptcha/RxSwift', :path => '../' - pod 'RxCocoa', '~> 4.3.1' + pod 'RxCocoa', '~> 4.3' pod 'SwiftLint', '~> 0.27' target 'ReCaptcha_Tests' do diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 5fa0f64..dc2b126 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -3,24 +3,28 @@ PODS: - ReCaptcha/Core (1.4) - ReCaptcha/RxSwift (1.4): - ReCaptcha/Core - - RxSwift (~> 4.3.1) - - RxBlocking (4.2.0): + - RxSwift (~> 4.3) + - 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) - - RxSwift (4.3.1) + - RxSwift (4.4.0): + - RxAtomic (~> 4.4) - SwiftLint (0.27.0) DEPENDENCIES: - AppSwizzle (~> 1.3) - ReCaptcha/RxSwift (from `../`) - RxBlocking (~> 4.0) - - RxCocoa (~> 4.3.1) + - RxCocoa (~> 4.3) - SwiftLint (~> 0.27) SPEC REPOS: https://github.com/cocoapods/specs.git: - AppSwizzle + - RxAtomic - RxBlocking - RxCocoa - RxSwift @@ -32,12 +36,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AppSwizzle: db36e436f56110d93e5ae0147683435df593cabc - ReCaptcha: b60192491bf2a88f7aa62659e4fad3115b45f19c - RxBlocking: e339d8a6e752e25ade95ff858466c55436668f59 - RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635 - RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4 + ReCaptcha: 5e28f45db4e425e0c17c4f305947fcb6018e1626 + RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f + RxBlocking: 138ad53217434444d6eeeb4fb406a45431d92e31 + RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749 + RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973 SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073 -PODFILE CHECKSUM: a23c69eb7704b3587227f939a054e176f34b8d90 +PODFILE CHECKSUM: 63f50401dee6a885ae0eea927fb966553c6d0f33 COCOAPODS: 1.5.3 diff --git a/Example/ReCaptcha.xcodeproj/project.pbxproj b/Example/ReCaptcha.xcodeproj/project.pbxproj index 6d5ed0e..724a01e 100644 --- a/Example/ReCaptcha.xcodeproj/project.pbxproj +++ b/Example/ReCaptcha.xcodeproj/project.pbxproj @@ -415,12 +415,14 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-ReCaptcha_Tests/Pods-ReCaptcha_Tests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/AppSwizzle/AppSwizzle.framework", "${BUILT_PRODUCTS_DIR}/RxBlocking/RxBlocking.framework", ); 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}/AppSwizzle.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxBlocking.framework", @@ -438,12 +440,14 @@ inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-ReCaptcha_Example/Pods-ReCaptcha_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/ReCaptcha/ReCaptcha.framework", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReCaptcha.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", ); diff --git a/ReCaptcha.podspec b/ReCaptcha.podspec index b2c6ccd..5636029 100644 --- a/ReCaptcha.podspec +++ b/ReCaptcha.podspec @@ -33,6 +33,6 @@ invisibility is not possible. s.subspec 'RxSwift' do |rx| rx.source_files = 'ReCaptcha/Classes/Rx/**/*' rx.dependency 'ReCaptcha/Core' - rx.dependency 'RxSwift', '~> 4.3.1' + rx.dependency 'RxSwift', '~> 4.3' end end