From ae39dde81d84cfa3a178fa4632d4edad955b784b Mon Sep 17 00:00:00 2001 From: Bas Broek Date: Wed, 8 Sep 2021 18:00:00 +0100 Subject: [PATCH] Pin dependencies to their major versions only Resolves #2206 --- Cartfile | 6 +++--- Cartfile.private | 6 +++--- Cartfile.resolved | 2 +- Moya.podspec | 2 +- Package.swift | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cartfile b/Cartfile index a97427c31..320429136 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "Alamofire/Alamofire" ~> 5.4.3 -github "ReactiveCocoa/ReactiveSwift" ~> 6.6.1 -github "ReactiveX/RxSwift" ~> 6.2.0 +github "Alamofire/Alamofire" ~> 5.0 +github "ReactiveCocoa/ReactiveSwift" ~> 6.0 +github "ReactiveX/RxSwift" ~> 6.0 diff --git a/Cartfile.private b/Cartfile.private index 4f6145eb7..0969bdb56 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "AliSoftware/OHHTTPStubs" ~> 9.0.0 -github "Quick/Quick" ~> 4.0.0 -github "Quick/Nimble" ~> 9.2.0 +github "AliSoftware/OHHTTPStubs" ~> 9.0 +github "Quick/Quick" ~> 4.0 +github "Quick/Nimble" ~> 9.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 5f064bafb..4ae6dbbe9 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -2,5 +2,5 @@ github "Alamofire/Alamofire" "5.4.3" github "AliSoftware/OHHTTPStubs" "9.1.0" github "Quick/Nimble" "v9.2.1" github "Quick/Quick" "v4.0.0" -github "ReactiveCocoa/ReactiveSwift" "6.6.1" +github "ReactiveCocoa/ReactiveSwift" "6.7.0" github "ReactiveX/RxSwift" "6.2.0" diff --git a/Moya.podspec b/Moya.podspec index 5a85d27f8..a3acb0ae0 100644 --- a/Moya.podspec +++ b/Moya.podspec @@ -41,7 +41,7 @@ Pod::Spec.new do |s| s.subspec "ReactiveSwift" do |ss| ss.source_files = "Sources/ReactiveMoya/" ss.dependency "Moya/Core" - ss.dependency "ReactiveSwift", "~> 6.6.1" + ss.dependency "ReactiveSwift", "~> 6.0" end s.subspec "RxSwift" do |ss| diff --git a/Package.swift b/Package.swift index 5d35568d9..6f83313dd 100644 --- a/Package.swift +++ b/Package.swift @@ -27,11 +27,11 @@ let package = Package( .library(name: "RxMoya", targets: ["RxMoya"]) ], dependencies: [ - .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.4.3")), - .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: "6.6.1")), - .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.2.0")), + .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.0.0")), + .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: "6.0.0")), + .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")), .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "4.0.0")), // dev - .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.2.0")), // dev + .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.0.0")), // dev .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", .upToNextMajor(from: "9.0.0")) // dev ] + rocketIfNeeded, targets: [