GitHub/Moya
1
0
Fork 0
mirror of https://github.com/Moya/Moya.git synced 2026-03-18 19:52:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extension on Publisher instead of AnyPublisher

Browse Source
This commit is contained in:
Kem Chen
2022-10-09 20:52:11 +08:00
parent 77e67c0b25
commit 69a47a6ae1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moya.xcodeproj/project.pbxproj
+4 -4
View File
@@ -86,7 +86,7 @@
D195C09B24748730005F6E98 /* CombineMoya.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D1B52E8E24747A6300C5FB76 /* CombineMoya.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D1B52E8424747A6300C5FB76 /* ReactiveMoya.h in Headers */ = {isa = PBXBuildFile; fileRef = 019BF5A88BB928EBDFD944FE /* ReactiveMoya.h */; settings = {ATTRIBUTES = (Public, ); }; };
D1B52E8A24747A6300C5FB76 /* Moya.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559D567FD0DA37D6CC98FF92 /* Moya.framework */; };
D1B52E9024747B2B00C5FB76 /* AnyPublisher+Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C98007231D4BE900AAAFB2 /* AnyPublisher+Response.swift */; };
D1B52E9024747B2B00C5FB76 /* Publisher+Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C98007231D4BE900AAAFB2 /* Publisher+Response.swift */; };
D1B52E9124747B2B00C5FB76 /* MoyaPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C98005231D41E400AAAFB2 /* MoyaPublisher.swift */; };
D1B52E9224747B2B00C5FB76 /* MoyaProvider+Combine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C97FFF231D2D4000AAAFB2 /* MoyaProvider+Combine.swift */; };
D1B52E9324747B4900C5FB76 /* CombineMoya.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D1B52E8E24747A6300C5FB76 /* CombineMoya.framework */; };
@@ -221,7 +221,7 @@
85C97FFF231D2D4000AAAFB2 /* MoyaProvider+Combine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MoyaProvider+Combine.swift"; sourceTree = "<group>"; };
85C98001231D3EC700AAAFB2 /* MoyaProvider+CombineSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MoyaProvider+CombineSpec.swift"; sourceTree = "<group>"; };
85C98005231D41E400AAAFB2 /* MoyaPublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoyaPublisher.swift; sourceTree = "<group>"; };
85C98007231D4BE900AAAFB2 /* AnyPublisher+Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AnyPublisher+Response.swift"; sourceTree = "<group>"; };
85C98007231D4BE900AAAFB2 /* Publisher+Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Publisher+Response.swift"; sourceTree = "<group>"; };
85D527792302BEF30093E9C1 /* TestImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestImage.swift; sourceTree = "<group>"; };
85F6042D22A018BB00063320 /* RequestTypeWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestTypeWrapper.swift; sourceTree = "<group>"; };
86F3C0EA472C23E786E23CE9 /* Image.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Image.swift; sourceTree = "<group>"; };
@@ -444,7 +444,7 @@
85C97FFE231D2D2D00AAAFB2 /* CombineMoya */ = {
isa = PBXGroup;
children = (
85C98007231D4BE900AAAFB2 /* AnyPublisher+Response.swift */,
85C98007231D4BE900AAAFB2 /* Publisher+Response.swift */,
85C98005231D41E400AAAFB2 /* MoyaPublisher.swift */,
85C97FFF231D2D4000AAAFB2 /* MoyaProvider+Combine.swift */,
);
@@ -1038,7 +1038,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D1B52E9024747B2B00C5FB76 /* AnyPublisher+Response.swift in Sources */,
D1B52E9024747B2B00C5FB76 /* Publisher+Response.swift in Sources */,
D1B52E9124747B2B00C5FB76 /* MoyaPublisher.swift in Sources */,
D1B52E9224747B2B00C5FB76 /* MoyaProvider+Combine.swift in Sources */,
);
Sources/CombineMoya/AnyPublisher+Response.swift → Sources/CombineMoya/Publisher+Response.swift
+3 -3
View File
@@ -12,7 +12,7 @@ import Moya
/// Extension for processing raw NSData generated by network access.
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
public extension AnyPublisher where Output == Response, Failure == MoyaError {
public extension Publisher where Output == Response, Failure == MoyaError {
/// Filters out responses that don't fall within the given range, generating errors when others are encountered.
func filter<R: RangeExpression>(statusCodes: R) -> AnyPublisher<Response, MoyaError> where R.Bound == Int {
@@ -72,7 +72,7 @@ public extension AnyPublisher where Output == Response, Failure == MoyaError {
}
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
public extension AnyPublisher where Output == ProgressResponse, Failure == MoyaError {
public extension Publisher where Output == ProgressResponse, Failure == MoyaError {
/**
Filter completed progress response and maps to actual response
@@ -99,7 +99,7 @@ public extension AnyPublisher where Output == ProgressResponse, Failure == MoyaE
}
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
extension AnyPublisher where Failure == MoyaError {
extension Publisher where Failure == MoyaError {
// Workaround for a lot of things, actually. We don't have Publishers.Once, flatMap
// that can throw and a lot more. So this monster was created because of that. Sorry.