diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b82157..2d02a17 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build-and-test: macos: - xcode: "10.3.0" + xcode: "11.4.0" steps: - checkout @@ -28,7 +28,7 @@ jobs: command: | cd Demo pod install - xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination 'name=iPhone Xs' build test | xcpretty -c + xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination 'name=iPhone 11 Pro' build test | xcpretty -c - run: name: Pod lib lint diff --git a/Changelog.md b/Changelog.md index 8643971..ca2e070 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,11 @@ Changelog Current master -------------- +5.1.0 +----- + +- Update RxSwift + 5.0.3 ----- diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index 74a9a68..146b7fd 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - Nimble (8.0.2) - - "NSObject+Rx (5.0.1)": - - RxSwift (~> 5.0) - - Quick (2.1.0) - - RxSwift (5.0.0) + - Nimble (8.0.7) + - "NSObject+Rx (5.1.0)": + - RxSwift (~> 5.1) + - Quick (2.2.0) + - RxSwift (5.1.1) DEPENDENCIES: - Nimble @@ -12,7 +12,7 @@ DEPENDENCIES: - RxSwift SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - Nimble - Quick - RxSwift @@ -22,11 +22,11 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Nimble: 622629381bda1dd5678162f21f1368cec7cbba60 - "NSObject+Rx": 1cc531f17bdb4e3aaac37874f1136c81091d2f6a - Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d - RxSwift: 8b0671caa829a763bbce7271095859121cbd895f + Nimble: a73af6ecd4c9106f434f3d55fc54570be3739e0b + "NSObject+Rx": fa6bbcc1ab1faa06b01466bc09b1e0692bbc5946 + Quick: 7fb19e13be07b5dfb3b90d4f9824c855a11af40e + RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178 PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728 -COCOAPODS: 1.7.5 +COCOAPODS: 1.9.1 diff --git a/Gemfile.lock b/Gemfile.lock index 2913164..cd874c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,46 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.1) + CFPropertyList (3.0.2) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.1) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) atomos (0.1.3) - babosa (1.0.2) + aws-eventstream (1.1.0) + aws-partitions (1.296.0) + aws-sdk-core (3.94.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.61.2) + aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.1) + aws-eventstream (~> 1.0, >= 1.0.2) + babosa (1.0.3) claide (1.0.3) - cocoapods (1.7.5) + cocoapods (1.9.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.5) + cocoapods-core (= 1.9.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.1, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -30,18 +49,22 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.5) + xcodeproj (>= 1.14.0, < 2.0) + cocoapods-core (1.9.1) activesupport (>= 4.0.2, < 6) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) + netrc (~> 0.11) + typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.2.2) + cocoapods-downloader (1.3.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.0) + cocoapods-trunk (1.4.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) @@ -49,40 +72,43 @@ GEM colored2 (3.1.2) commander-fastlane (4.4.6) highline (~> 1.7.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) declarative (0.0.10) declarative-option (0.1.0) - digest-crc (0.4.1) + digest-crc (0.5.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) emoji_regex (1.0.1) escape (0.0.4) - excon (0.66.0) - faraday (0.15.4) + ethon (0.12.0) + ffi (>= 1.3.0) + excon (0.73.0) + faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - fastimage (2.1.5) - fastlane (2.129.0) + fastimage (2.1.7) + fastlane (2.145.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) + aws-sdk-s3 (~> 1.0) babosa (>= 1.0.2, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 2.0) - excon (>= 0.45.0, < 1.0.0) - faraday (~> 0.9) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 0.17) faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 0.9) + faraday_middleware (~> 0.13.1) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.21.2, < 0.24.0) + google-api-client (>= 0.29.2, < 0.37.0) google-cloud-storage (>= 1.15.0, < 2.0.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) @@ -92,7 +118,7 @@ GEM multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) public_suffix (~> 2.0.0) - rubyzip (>= 1.2.2, < 2.0.0) + rubyzip (>= 1.3.0, < 2.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -101,59 +127,63 @@ GEM tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.8.1, < 2.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) + ffi (1.12.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-api-client (0.23.9) + google-api-client (0.36.4) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.7.0) + googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) - mime-types (~> 3.0) + mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - signet (~> 0.9) - google-cloud-core (1.3.1) + signet (~> 0.12) + google-cloud-core (1.5.0) google-cloud-env (~> 1.0) - google-cloud-env (1.2.1) - faraday (~> 0.11) - google-cloud-storage (1.16.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.3.1) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.0.0) + google-cloud-storage (1.26.0) + addressable (~> 2.5) digest-crc (~> 0.4) - google-api-client (~> 0.23) + google-api-client (~> 0.33) google-cloud-core (~> 1.2) - googleauth (>= 0.6.2, < 0.10.0) - googleauth (0.6.7) - faraday (~> 0.12) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.11.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.7) + signet (~> 0.12) highline (1.7.10) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - json (2.2.0) + jmespath (1.4.0) + json (2.3.0) jwt (2.1.0) - memoist (0.16.0) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mini_magick (4.9.5) - minitest (5.11.3) + memoist (0.16.2) + mini_magick (4.10.1) + mini_mime (1.0.2) + minitest (5.14.0) molinillo (0.6.6) - multi_json (1.13.1) + multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.6) nap (1.1.0) naturally (2.2.0) netrc (0.11.0) - os (1.0.1) + os (1.1.0) plist (3.5.0) public_suffix (2.0.5) representable (3.0.4) @@ -163,14 +193,14 @@ GEM retriable (3.1.2) rouge (2.0.7) ruby-macho (1.4.0) - rubyzip (1.2.3) + rubyzip (1.3.0) security (0.1.3) - signet (0.11.0) + signet (0.14.0) addressable (~> 2.3) - faraday (~> 0.9) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.5) + simctl (1.6.8) CFPropertyList naturally slack-notifier (2.3.2) @@ -178,19 +208,21 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - tty-cursor (0.7.0) - tty-screen (0.7.0) - tty-spinner (0.9.1) + tty-cursor (0.7.1) + tty-screen (0.7.1) + tty-spinner (0.9.3) tty-cursor (~> 0.7) - tzinfo (1.2.5) + typhoeus (1.3.1) + ethon (>= 0.9.0) + tzinfo (1.2.7) thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) - unicode-display_width (1.6.0) + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) word_wrap (1.0.0) - xcodeproj (1.12.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -209,4 +241,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/NSObject+Rx.podspec b/NSObject+Rx.podspec index 2d8cb05..9598f2e 100644 --- a/NSObject+Rx.podspec +++ b/NSObject+Rx.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "NSObject+Rx" - s.version = "5.0.3" + s.version = "5.1.0" s.summary = "Handy RxSwift extensions on NSObject." s.description = <<-DESC Right now, we just have a `rx_disposeBag` property, but we're open to PRs! @@ -15,9 +15,9 @@ Pod::Spec.new do |s| s.watchos.deployment_target = '3.0' s.tvos.deployment_target = '9.0' - s.swift_version = '5.0' + s.swift_version = '5.2' s.source = { :git => "https://github.com/RxSwiftCommunity/NSObject-Rx.git", :tag => s.version } s.source_files = %w(NSObject+Rx.swift HasDisposeBag.swift) s.frameworks = "Foundation" - s.dependency 'RxSwift', '~> 5.0' + s.dependency 'RxSwift', '~> 5.1' end diff --git a/Package.swift b/Package.swift index 9f5d8a1..6cb626c 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( .library(name: "NSObject-Rx", targets: ["NSObject-Rx"]), ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift", from: "5.0.1"), + .package(url: "https://github.com/ReactiveX/RxSwift", from: "5.1.1"), ], targets: [ .target(