diff --git a/.travis.yml b/.travis.yml index 1e706be..8808750 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode10 +osx_image: xcode10.2 language: objective-c cache: diff --git a/Cartfile b/Cartfile index 4056d09..6a8bfd6 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveX/RxSwift" ~> 4.3 +github "ReactiveX/RxSwift" ~> 5.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index ce434dc..b751e3d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ReactiveX/RxSwift" "4.4.0" +github "ReactiveX/RxSwift" "5.0.1" diff --git a/Example/Podfile b/Example/Podfile index f83fcbc..47441a3 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -5,14 +5,14 @@ inhibit_all_warnings! target 'ReCaptcha_Example' do pod 'ReCaptcha/RxSwift', :path => '../' - pod 'RxCocoa', '~> 4.3' + pod 'RxCocoa', '~> 5.0' pod 'SwiftLint', '~> 0.33' target 'ReCaptcha_Tests' do inherit! :search_paths pod 'AppSwizzle', '~> 1.3' - pod 'RxBlocking', '~> 4.0' + pod 'RxBlocking', '~> 5.0' end target 'ReCaptcha_UITests' do diff --git a/Example/Podfile.lock b/Example/Podfile.lock index a14ca37..b6e6798 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -3,30 +3,30 @@ PODS: - ReCaptcha/Core (1.4.2) - ReCaptcha/RxSwift (1.4.2): - ReCaptcha/Core - - RxSwift (~> 4.3) - - RxAtomic (4.4.0) - - RxBlocking (4.4.0): - - RxAtomic (~> 4.4) - - RxSwift (~> 4.0) - - RxCocoa (4.4.0): - - RxSwift (~> 4.0) - - RxSwift (4.4.0): - - RxAtomic (~> 4.4) + - RxSwift (~> 5.0) + - RxBlocking (5.0.0): + - RxSwift (~> 5) + - RxCocoa (5.0.0): + - RxRelay (~> 5) + - RxSwift (~> 5) + - RxRelay (5.0.0): + - RxSwift (~> 5) + - RxSwift (5.0.0) - SwiftLint (0.33.0) DEPENDENCIES: - AppSwizzle (~> 1.3) - ReCaptcha/RxSwift (from `../`) - - RxBlocking (~> 4.0) - - RxCocoa (~> 4.3) + - RxBlocking (~> 5.0) + - RxCocoa (~> 5.0) - SwiftLint (~> 0.33) SPEC REPOS: https://github.com/cocoapods/specs.git: - AppSwizzle - - RxAtomic - RxBlocking - RxCocoa + - RxRelay - RxSwift - SwiftLint @@ -36,13 +36,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AppSwizzle: db36e436f56110d93e5ae0147683435df593cabc - ReCaptcha: e3f47cf5699f4398aee978ade230cb76976c24ac - RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f - RxBlocking: 138ad53217434444d6eeeb4fb406a45431d92e31 - RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749 - RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973 + ReCaptcha: 3f0282f24de3a609ff9698c86f57816145979966 + RxBlocking: c67185d26498ea3cbe3e121917c3c16739e43123 + RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8 + RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18 + RxSwift: 8b0671caa829a763bbce7271095859121cbd895f SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e -PODFILE CHECKSUM: d728df5085a7047e5168bb8a1af942e64585b287 +PODFILE CHECKSUM: cb17a6e1597e970715958e2150c34b7fef3008f9 COCOAPODS: 1.7.2 diff --git a/Example/ReCaptcha.xcodeproj/project.pbxproj b/Example/ReCaptcha.xcodeproj/project.pbxproj index ae4144d..bfff3be 100644 --- a/Example/ReCaptcha.xcodeproj/project.pbxproj +++ b/Example/ReCaptcha.xcodeproj/project.pbxproj @@ -326,17 +326,18 @@ 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; DevelopmentTeam = 58EEZG76L8; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; }; F28FAC9B200E425600E14987 = { CreatedOnToolsVersion = 9.1; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; TestTargetID = 607FACCF1AFB9204008FA782; }; F2ECCF751E9FC47B0097B199 = { CreatedOnToolsVersion = 8.3; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; TestTargetID = 607FACCF1AFB9204008FA782; }; @@ -418,14 +419,12 @@ ); inputPaths = ( "${PODS_ROOT}/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", @@ -443,15 +442,15 @@ inputPaths = ( "${PODS_ROOT}/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}/RxRelay/RxRelay.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}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -707,8 +706,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.flaviocaetano.ReCaptcha-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Development Wildcard"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -725,8 +723,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.flaviocaetano.ReCaptcha-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -749,7 +746,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "ReCaptcha.ReCaptcha-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = ReCaptcha_Example; }; @@ -772,7 +769,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "ReCaptcha.ReCaptcha-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = ReCaptcha_Example; }; @@ -794,8 +791,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.flaviocaetano.ReCaptcha-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG UNIT_TESTS"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReCaptcha_Example.app/ReCaptcha_Example"; }; name = Debug; @@ -814,8 +810,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.flaviocaetano.ReCaptcha-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReCaptcha_Example.app/ReCaptcha_Example"; }; name = Release; diff --git a/ReCaptcha.podspec b/ReCaptcha.podspec index c032282..c6a81b6 100644 --- a/ReCaptcha.podspec +++ b/ReCaptcha.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.name = 'ReCaptcha' s.version = '1.4.2' s.summary = 'ReCaptcha for iOS' - s.swift_version = '4.2' + s.swift_version = '5.0' s.description = <<-DESC Add Google's [Invisible ReCaptcha](https://developers.google.com/recaptcha/docs/invisible) to your project. This library @@ -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' + rx.dependency 'RxSwift', '~> 5.0' end end diff --git a/ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift b/ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift index 48ed148..b6460e5 100644 --- a/ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift +++ b/ReCaptcha/Classes/Rx/ReCaptcha+Rx.swift @@ -73,8 +73,8 @@ public extension Reactive where Base: ReCaptcha { already finished loading when you subscribe to this Observable. */ var didFinishLoading: Observable { - return Observable.create { [weak base] observer in - base?.didFinishLoading(observer.onNext) + return Observable.create { [weak base] (observer: AnyObserver) in + base?.didFinishLoading { observer.onNext(()) } return Disposables.create { [weak base] in base?.didFinishLoading(nil)