From e5a28fb62dd5ff4e17b7025643366550044a40b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mro=CC=81z?= Date: Tue, 7 Jul 2020 19:03:36 +0200 Subject: [PATCH] Version 15.0.0-alpha.1 --- Changelog.md | 2 + Moya.podspec | 2 +- .../xcshareddata/xcschemes/Basic.xcscheme | 78 +++++++++++++++++++ Package.swift | 10 +-- 4 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 Moya.xcodeproj/xcshareddata/xcschemes/Basic.xcscheme diff --git a/Changelog.md b/Changelog.md index 275af46e8..c99cd0c22 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,7 @@ # Next +# [15.0.0-alpha.1] - 2020-07-07 + ## Added - We brought back Combine support! [#2024](https://github.com/Moya/Moya/pull/2024) by [@MaxDesiatov](https://github.com/MaxDesiatov). diff --git a/Moya.podspec b/Moya.podspec index 218c697fd..53527ab73 100644 --- a/Moya.podspec +++ b/Moya.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Moya" - s.version = "14.0.0" + s.version = "15.0.0-alpha.1" s.summary = "Network abstraction layer written in Swift" s.description = <<-EOS Moya abstracts network commands using Swift Generics to provide developers diff --git a/Moya.xcodeproj/xcshareddata/xcschemes/Basic.xcscheme b/Moya.xcodeproj/xcshareddata/xcschemes/Basic.xcscheme new file mode 100644 index 000000000..7fa70969f --- /dev/null +++ b/Moya.xcodeproj/xcshareddata/xcschemes/Basic.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Package.swift b/Package.swift index 48133216e..ef622be12 100644 --- a/Package.swift +++ b/Package.swift @@ -6,7 +6,7 @@ let rocketIfNeeded: [Package.Dependency] #if os(OSX) || os(Linux) rocketIfNeeded = [ - .package(url: "https://github.com/shibapm/Rocket", .upToNextMajor(from: "1.0.0")) // dev +// .package(url: "https://github.com/shibapm/Rocket", .upToNextMajor(from: "1.0.0")) // dev ] #else rocketIfNeeded = [] @@ -30,16 +30,16 @@ let package = Package( .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.0.0")), .package(url: "https://github.com/Moya/ReactiveSwift.git", .upToNextMajor(from: "6.1.0")), .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")), - .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "2.0.0")), // dev - .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "8.0.0")), // dev - .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", .upToNextMajor(from: "9.0.0")) // dev +// .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "2.0.0")), // dev +// .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "8.0.0")), // dev +// .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", .upToNextMajor(from: "9.0.0")) // dev ] + rocketIfNeeded, targets: [ .target(name: "Moya", dependencies: ["Alamofire"]), .target(name: "CombineMoya", dependencies: ["Moya"]), .target(name: "ReactiveMoya", dependencies: ["Moya", "ReactiveSwift"]), .target(name: "RxMoya", dependencies: ["Moya", "RxSwift"]), - .testTarget(name: "MoyaTests", dependencies: ["Moya", "CombineMoya", "RxMoya", "ReactiveMoya", "Quick", "Nimble", "OHHTTPStubsSwift"]) // dev +// .testTarget(name: "MoyaTests", dependencies: ["Moya", "CombineMoya", "RxMoya", "ReactiveMoya", "Quick", "Nimble", "OHHTTPStubsSwift"]) // dev ] )