diff --git a/Package.swift b/Package.swift index 1502b9e..5863538 100644 --- a/Package.swift +++ b/Package.swift @@ -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")) ] diff --git a/Sources/RxMoya-ModelMapper/Observable+ModelMapper.swift b/Sources/RxMoya-ModelMapper/Observable+ModelMapper.swift index a7d701d..8fbd4a3 100644 --- a/Sources/RxMoya-ModelMapper/Observable+ModelMapper.swift +++ b/Sources/RxMoya-ModelMapper/Observable+ModelMapper.swift @@ -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. diff --git a/Sources/RxMoya-ModelMapper/ObservableAvailability.swift b/Sources/RxMoya-ModelMapper/ObservableAvailability.swift index 77b400a..ca90730 100644 --- a/Sources/RxMoya-ModelMapper/ObservableAvailability.swift +++ b/Sources/RxMoya-ModelMapper/ObservableAvailability.swift @@ -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(type: T.Type, keyPath: String? = nil) -> Observable { fatalError() } diff --git a/Sources/RxMoya-ModelMapper/Single+ModelMapper.swift b/Sources/RxMoya-ModelMapper/Single+ModelMapper.swift index 32c8dc2..5dd23b9 100644 --- a/Sources/RxMoya-ModelMapper/Single+ModelMapper.swift +++ b/Sources/RxMoya-ModelMapper/Single+ModelMapper.swift @@ -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.