diff --git a/Gemfile.lock b/Gemfile.lock index f6dcd05..f44248f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,69 +1,94 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.5) - activesupport (4.2.9) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - claide (1.0.2) - cocoapods (1.2.1) - activesupport (>= 4.0.2, < 5) - claide (>= 1.0.1, < 2.0) - cocoapods-core (= 1.2.1) - cocoapods-deintegrate (>= 1.0.1, < 2.0) - cocoapods-downloader (>= 1.1.3, < 2.0) + CFPropertyList (3.0.4) + rexml + activesupport (6.1.4.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.0.3) + cocoapods (1.11.2) + addressable (~> 2.8) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.11.2) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.4.0, < 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.2.0, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.5.7) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.4.4, < 2.0) - cocoapods-core (1.2.1) - activesupport (>= 4.0.2, < 5) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.2) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.1) - cocoapods-downloader (1.1.3) + netrc (~> 0.11) + public_suffix (~> 4.0) + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.5.1) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) - cocoapods-trunk (1.2.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) - netrc (= 0.7.8) - cocoapods-try (1.1.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) colored2 (3.1.2) + concurrent-ruby (1.1.9) escape (0.0.4) - fourflusher (2.0.1) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.4) + fourflusher (2.3.1) fuzzy_match (2.0.4) - gh_inspector (1.0.3) - i18n (0.8.4) - minitest (5.10.2) - molinillo (0.5.7) - nanaimo (0.2.3) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (1.8.10) + concurrent-ruby (~> 1.0) + json (2.5.1) + minitest (5.14.4) + molinillo (0.8.0) + nanaimo (0.3.0) nap (1.1.0) - netrc (0.7.8) + netrc (0.11.0) + public_suffix (4.0.6) + rexml (3.2.5) rouge (2.0.7) - ruby-macho (1.1.0) - thread_safe (0.3.6) - tzinfo (1.2.3) - thread_safe (~> 0.1) - xcodeproj (1.5.0) - CFPropertyList (~> 2.3.3) + ruby-macho (2.5.1) + typhoeus (1.4.0) + ethon (>= 0.9.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + xcodeproj (1.21.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.3) - xcpretty (0.2.8) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) rouge (~> 2.0.7) + zeitwerk (2.4.2) PLATFORMS ruby @@ -76,4 +101,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.14.3 + 1.17.2 diff --git a/MoyaSugar.podspec b/MoyaSugar.podspec index 218753f..939d9af 100644 --- a/MoyaSugar.podspec +++ b/MoyaSugar.podspec @@ -19,12 +19,12 @@ Pod::Spec.new do |s| s.subspec 'Core' do |ss| ss.source_files = 'Sources/MoyaSugar/*.swift' ss.frameworks = 'Foundation' - ss.dependency 'Moya', '>= 14.0.0-beta.2' + ss.dependency 'Moya', '~> 15.0' end s.subspec 'RxSwift' do |ss| ss.dependency 'MoyaSugar/Core' - ss.dependency 'Moya/RxSwift', '>= 14.0.0-beta.2' + ss.dependency 'Moya/RxSwift', '~> 15.0' ss.dependency 'RxSwift', '>= 5.0.0' end end diff --git a/Package.resolved b/Package.resolved index ac3729f..db4d0ee 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,26 +6,8 @@ "repositoryURL": "https://github.com/Alamofire/Alamofire.git", "state": { "branch": null, - "revision": "c1d14588e5558a3669fd03510d135d88c5109069", - "version": "5.0.0-rc.2" - } - }, - { - "package": "CwlCatchException", - "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git", - "state": { - "branch": null, - "revision": "7cd2f8cacc4d22f21bc0b2309c3b18acf7957b66", - "version": "1.2.0" - } - }, - { - "package": "CwlPreconditionTesting", - "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git", - "state": { - "branch": null, - "revision": "c228db5d2ad1b01ebc84435e823e6cca4e3db98b", - "version": "1.2.0" + "revision": "d120af1e8638c7da36c8481fd61a66c0c08dc4fc", + "version": "5.4.4" } }, { @@ -42,26 +24,8 @@ "repositoryURL": "https://github.com/Moya/Moya.git", "state": { "branch": null, - "revision": "062db248c4f320d35a18bd4046a2adc164d64934", - "version": "14.0.0-beta.2" - } - }, - { - "package": "Nimble", - "repositoryURL": "https://github.com/Quick/Nimble.git", - "state": { - "branch": null, - "revision": "6abeb3f5c03beba2b9e4dbe20886e773b5b629b6", - "version": "8.0.4" - } - }, - { - "package": "Quick", - "repositoryURL": "https://github.com/Quick/Quick.git", - "state": { - "branch": null, - "revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37", - "version": "2.1.0" + "revision": "9b906860e3c3c09032879465c471e6375829593f", + "version": "15.0.0" } }, { @@ -69,8 +33,8 @@ "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git", "state": { "branch": null, - "revision": "b772fa0b624926e6e2f21acbb79297736a05c585", - "version": "6.1.0" + "revision": "c43bae3dac73fdd3cb906bd5a1914686ca71ed3c", + "version": "6.7.0" } }, { @@ -78,8 +42,8 @@ "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", "state": { "branch": null, - "revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395", - "version": "5.0.1" + "revision": "7c17a6ccca06b5c107cfa4284e634562ddaf5951", + "version": "6.2.0" } }, { diff --git a/Package.swift b/Package.swift index 47fce29..a5b7aab 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( .library(name: "MoyaSugar", targets: ["MoyaSugar"]), ], dependencies: [ - .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "14.0.0-beta.2")), + .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "15.0.0")), .package(url: "https://github.com/devxoul/Immutable.git", .upToNextMajor(from: "0.5.0")), .package(url: "https://github.com/devxoul/Then.git", .upToNextMajor(from: "2.2.0")), ],