Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let shouldTest = ProcessInfo.processInfo.environment["TEST_MM"] == "1"

func resolveDependencies() -> [Package.Dependency] {
let baseDependencies: [Package.Dependency] = [
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "14.0.0")),
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "15.0.0")),
.package(url: "https://github.com/lyft/mapper.git", .upToNextMajor(from: "10.0.0"))
]

Expand Down
2 changes: 1 addition & 1 deletion Sources/RxMoya-ModelMapper/Observable+ModelMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Mapper
#endif

/// Extension for processing Responses into Mappable objects through ObjectMapper
public extension ObservableType where E == Response {
public extension ObservableType where Element == Response {

/// Maps data received from the signal into an object which implement the Mappable protocol
/// If the conversion fails, error event is sent.
Expand Down
2 changes: 1 addition & 1 deletion Sources/RxMoya-ModelMapper/ObservableAvailability.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Mapper
import Moya_ModelMapper
#endif

public extension ObservableType where E == Response {
public extension ObservableType where Element == Response {

@available(*, unavailable, renamed: "map(to:keyPath:)")
public func mapObject<T: Mappable>(type: T.Type, keyPath: String? = nil) -> Observable<T> { fatalError() }
Expand Down
2 changes: 1 addition & 1 deletion Sources/RxMoya-ModelMapper/Single+ModelMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Mapper
#endif

/// Extension for processing Responses into Mappable objects through ObjectMapper
extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Response {
extension PrimitiveSequence where Trait == SingleTrait, Element == Response {

/// Maps data received from the signal into an object which implements the Mappable protocol.
/// If the conversion fails, the signal errors.
Expand Down