Fix Xcode 10.2 warnings

Dangerfile

@@ -49,13 +49,13 @@ end
 
 # Run danger-prose to lint Chinese docs
 added_and_modified_cn_docs = (git.added_files.grep(%r{docs_CN/*.md}) + git.modified_files.grep(%r{docs_CN/*.md}))
-if added_and_modified_cn_docs.empty?
+unless added_and_modified_cn_docs.empty?
   prose.lint_files added_and_modified_cn_docs
 end
 
 # Run danger-prose to lint and check spelling English docs
 added_and_modified_en_docs = (git.added_files.grep(%r{docs/*.md}) + git.modified_files.grep(%r{docs/*.md}))
-if added_and_modified_en_docs.empty?
+unless added_and_modified_en_docs.empty?
   prose.lint_files added_and_modified_en_docs
 
   prose.language = "en-us"

Moya.xcodeproj/project.pbxproj

@@ -637,7 +637,7 @@
 			};
 			buildConfigurationList = CF2B188FD83B4489A8520824 /* Build configuration list for PBXProject "Moya" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,

Sources/Moya/Endpoint.swift

@@ -119,9 +119,12 @@ extension Endpoint {
 
 /// Required for using `Endpoint` as a key type in a `Dictionary`.
 extension Endpoint: Equatable, Hashable {
-    public var hashValue: Int {
-        let request = try? urlRequest()
-        return request?.hashValue ?? url.hashValue
+    public func hash(into hasher: inout Hasher) {
+        guard let request = try? urlRequest() else {
+            hasher.combine(url)
+            return
+        }
+        hasher.combine(request)
     }
 
     /// Note: If both Endpoints fail to produce a URLRequest the comparison will

Sources/Moya/MoyaProvider+Defaults.swift

@@ -2,7 +2,7 @@ import Foundation
 
 /// These functions are default mappings to `MoyaProvider`'s properties: endpoints, requests, manager, etc.
 public extension MoyaProvider {
-    public final class func defaultEndpointMapping(for target: Target) -> Endpoint {
+    final class func defaultEndpointMapping(for target: Target) -> Endpoint {
         return Endpoint(
             url: URL(target: target).absoluteString,
             sampleResponseClosure: { .networkResponse(200, target.sampleData) },
@@ -12,7 +12,7 @@ public extension MoyaProvider {
         )
     }
 
-    public final class func defaultRequestMapping(for endpoint: Endpoint, closure: RequestResultClosure) {
+    final class func defaultRequestMapping(for endpoint: Endpoint, closure: RequestResultClosure) {
         do {
             let urlRequest = try endpoint.urlRequest()
             closure(.success(urlRequest))
@@ -25,7 +25,7 @@ public extension MoyaProvider {
         }
     }
 
-    public final class func defaultAlamofireManager() -> Manager {
+    final class func defaultAlamofireManager() -> Manager {
         let configuration = URLSessionConfiguration.default
         configuration.httpAdditionalHeaders = Manager.defaultHTTPHeaders
 

Sources/Moya/MoyaProvider+Internal.swift

@@ -115,7 +115,7 @@ public extension MoyaProvider {
     }
 
     /// Creates a function which, when called, executes the appropriate stubbing behavior for the given parameters.
-    public final func createStubFunction(_ token: CancellableToken, forTarget target: Target, withCompletion completion: @escaping Moya.Completion, endpoint: Endpoint, plugins: [PluginType], request: URLRequest) -> (() -> Void) { // swiftlint:disable:this function_parameter_count
+    final func createStubFunction(_ token: CancellableToken, forTarget target: Target, withCompletion completion: @escaping Moya.Completion, endpoint: Endpoint, plugins: [PluginType], request: URLRequest) -> (() -> Void) { // swiftlint:disable:this function_parameter_count
         return {
             if token.isCancelled {
                 self.cancelCompletion(completion, target: target)

Sources/Moya/MoyaProvider.swift

@@ -170,17 +170,17 @@ public extension MoyaProvider {
     // at least add some class functions to allow easy access to common stubbing closures.
 
     /// Do not stub.
-    public final class func neverStub(_: Target) -> Moya.StubBehavior {
+    final class func neverStub(_: Target) -> Moya.StubBehavior {
         return .never
     }
 
     /// Return a response immediately.
-    public final class func immediatelyStub(_: Target) -> Moya.StubBehavior {
+    final class func immediatelyStub(_: Target) -> Moya.StubBehavior {
         return .immediate
     }
 
     /// Return a response after a delay.
-    public final class func delayedStub(_ seconds: TimeInterval) -> (Target) -> Moya.StubBehavior {
+    final class func delayedStub(_ seconds: TimeInterval) -> (Target) -> Moya.StubBehavior {
         return { _ in return .delayed(seconds: seconds) }
     }
 }

Sources/Moya/Response.swift

@@ -48,7 +48,7 @@ public extension Response {
         - statusCodes: The range of acceptable status codes.
      - throws: `MoyaError.statusCode` when others are encountered.
     */
-    public func filter<R: RangeExpression>(statusCodes: R) throws -> Response where R.Bound == Int {
+    func filter<R: RangeExpression>(statusCodes: R) throws -> Response where R.Bound == Int {
         guard statusCodes.contains(statusCode) else {
             throw MoyaError.statusCode(self)
         }
@@ -62,7 +62,7 @@ public extension Response {
         - statusCode: The acceptable status code.
      - throws: `MoyaError.statusCode` when others are encountered.
     */
-    public func filter(statusCode: Int) throws -> Response {
+    func filter(statusCode: Int) throws -> Response {
         return try filter(statusCodes: statusCode...statusCode)
     }
 
@@ -71,7 +71,7 @@ public extension Response {
 
      - throws: `MoyaError.statusCode` when others are encountered.
     */
-    public func filterSuccessfulStatusCodes() throws -> Response {
+    func filterSuccessfulStatusCodes() throws -> Response {
         return try filter(statusCodes: 200...299)
     }
 
@@ -80,7 +80,7 @@ public extension Response {
 
      - throws: `MoyaError.statusCode` when others are encountered.
     */
-    public func filterSuccessfulStatusAndRedirectCodes() throws -> Response {
+    func filterSuccessfulStatusAndRedirectCodes() throws -> Response {
         return try filter(statusCodes: 200...399)
     }
 
@@ -110,7 +110,7 @@ public extension Response {
     /// Maps data received from the signal into a String.
     ///
     /// - parameter atKeyPath: Optional key path at which to parse string.
-    public func mapString(atKeyPath keyPath: String? = nil) throws -> String {
+    func mapString(atKeyPath keyPath: String? = nil) throws -> String {
         if let keyPath = keyPath {
             // Key path was provided, try to parse string at key path
             guard let jsonDictionary = try mapJSON() as? NSDictionary,

Sources/Moya/TargetType.swift

@@ -36,7 +36,7 @@ public extension TargetType {
 // MARK: - Deprecated
 
 extension TargetType {
-    @available(*, deprecated: 11.0, message:
+    @available(*, deprecated, message:
     "TargetType's validate property has been deprecated in 11.0. Please use validationType: ValidationType.")
     var validate: Bool {
         return false

Sources/ReactiveMoya/MoyaProvider+Reactive.swift

@@ -9,7 +9,7 @@ extension MoyaProvider: ReactiveExtensionsProvider {}
 public extension Reactive where Base: MoyaProviderType {
 
     /// Designated request-making method.
-    public func request(_ token: Base.Target, callbackQueue: DispatchQueue? = nil) -> SignalProducer<Response, MoyaError> {
+    func request(_ token: Base.Target, callbackQueue: DispatchQueue? = nil) -> SignalProducer<Response, MoyaError> {
         return SignalProducer { [weak base] observer, lifetime in
             let cancellableToken = base?.request(token, callbackQueue: callbackQueue, progress: nil) { result in
                 switch result {
@@ -28,7 +28,7 @@ public extension Reactive where Base: MoyaProviderType {
     }
 
     /// Designated request-making method with progress.
-    public func requestWithProgress(_ token: Base.Target, callbackQueue: DispatchQueue? = nil) -> SignalProducer<ProgressResponse, MoyaError> {
+    func requestWithProgress(_ token: Base.Target, callbackQueue: DispatchQueue? = nil) -> SignalProducer<ProgressResponse, MoyaError> {
         let progressBlock: (Signal<ProgressResponse, MoyaError>.Observer) -> (ProgressResponse) -> Void = { observer in
             return { progress in
                 observer.send(value: progress)

Sources/RxMoya/MoyaProvider+Rx.swift

@@ -14,7 +14,7 @@ public extension Reactive where Base: MoyaProviderType {
     ///   - token: Entity, which provides specifications necessary for a `MoyaProvider`.
     ///   - callbackQueue: Callback queue. If nil - queue from provider initializer will be used.
     /// - Returns: Single response object.
-    public func request(_ token: Base.Target, callbackQueue: DispatchQueue? = nil) -> Single<Response> {
+    func request(_ token: Base.Target, callbackQueue: DispatchQueue? = nil) -> Single<Response> {
         return Single.create { [weak base] single in
             let cancellableToken = base?.request(token, callbackQueue: callbackQueue, progress: nil) { result in
                 switch result {
@@ -32,7 +32,7 @@ public extension Reactive where Base: MoyaProviderType {
     }
 
     /// Designated request-making method with progress.
-    public func requestWithProgress(_ token: Base.Target, callbackQueue: DispatchQueue? = nil) -> Observable<ProgressResponse> {
+    func requestWithProgress(_ token: Base.Target, callbackQueue: DispatchQueue? = nil) -> Observable<ProgressResponse> {
         let progressBlock: (AnyObserver) -> (ProgressResponse) -> Void = { observer in
             return { progress in
                 observer.onNext(progress)