Bump Moya version + Sample project update

.gitignore

@@ -35,3 +35,5 @@ Sample/Pods/
 # Carthage/Checkouts
 
 Carthage/Build
+
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Moya-ObjectMapper.podspec

@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.subspec "Core" do |ss|
     ss.source_files  = "Source/Core/*.swift"
-    ss.dependency "Moya", '~> 14.0.0-beta.6'
+    ss.dependency "Moya", '~> 15.0.0'
     ss.dependency "ObjectMapper"
     ss.framework  = "Foundation"
   end

Package.swift

@@ -5,45 +5,54 @@ import PackageDescription
 
 let package = Package(
     name: "Moya-ObjectMapper",
+    platforms: [
+        .iOS(.v10)
+    ],
     products: [
         .library(name: "Moya-ObjectMapper", targets: ["Moya-ObjectMapper"]),
         .library(name: "Moya-RxSwift-ObjectMapper", targets: ["Moya-RxSwift-ObjectMapper"]),
         .library(name: "Moya-ReactiveSwift-ObjectMapper", targets: ["Moya-ReactiveSwift-ObjectMapper"])
     ],
     dependencies: [
-        .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "12.0.0")),
-        .package(url: "https://github.com/tristanhimmelman/ObjectMapper.git", .upToNextMajor(from: "3.4.0")),
-        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.5.0")),
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: "4.0.0"))
+        .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "15.0.0")),
+        .package(url: "https://github.com/tristanhimmelman/ObjectMapper.git", .upToNextMajor(from: "4.2.0")),
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.2.0")),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: "6.7.0"))
     ],
     targets: [
+
         .target(
             name: "Moya-ObjectMapper",
             dependencies: [
                 "Moya",
-                "ObjectMapper"],
+                "ObjectMapper"
+            ],
             path: "Source/Core",
-            exclude: [
-                "Sample"]),
+            exclude: ["Sample"]
+        ),
         .target(
             name: "Moya-RxSwift-ObjectMapper",
             dependencies: [
                 "Moya",
-                "RxMoya",
                 "ObjectMapper",
-                "RxSwift"],
+                "Moya-ObjectMapper",
+                "RxSwift",
+                .product(name: "RxMoya", package: "Moya")
+            ],
             path: "Source/RxSwift",
-            exclude: [
-                "Sample"]),
+            exclude: ["Sample"]
+        ),
         .target(
             name: "Moya-ReactiveSwift-ObjectMapper",
             dependencies: [
                 "Moya",
-                "ReactiveMoya",
                 "ObjectMapper",
-                "ReactiveSwift"],
+                "Moya-ObjectMapper",
+                "ReactiveSwift",
+                .product(name: "ReactiveMoya", package: "Moya")
+            ],
             path: "Source/ReactiveSwift",
-            exclude: [
-                "Sample"])
+            exclude: ["Sample"]
+        )
     ]
 )

Sample/Common/Resources/Base.lproj/Main.storyboard

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="9fE-rm-iIL">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="9fE-rm-iIL">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -16,26 +14,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="XqI-te-CgY">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" textLabel="a51-T5-z9Q" style="IBUITableViewCellStyleDefault" id="vDB-kj-Hda">
-                                <rect key="frame" x="0.0" y="22" width="375" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vDB-kj-Hda" id="Azh-KN-cNV">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="a51-T5-z9Q">
-                                            <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     </tableView>
                     <navigationItem key="navigationItem" title="Root View Controller" id="fZ1-y1-Xxt">
                         <barButtonItem key="leftBarButtonItem" title="Zen" id="bkk-cH-CrR">
@@ -64,7 +43,7 @@
             <objects>
                 <navigationController id="9fE-rm-iIL" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="569-cx-LCm">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>

Sample/Common/ViewController.swift

@@ -3,16 +3,19 @@ import UIKit
 class ViewController: UIViewController,  UITableViewDelegate, UITableViewDataSource {
   @IBOutlet weak var zenButton: UIBarButtonItem!
   @IBOutlet weak var searchButton: UIBarButtonItem!
-  @IBOutlet var tableView: UITableView!
+  @IBOutlet var tableView: UITableView! {
+    didSet {
+      tableView.dataSource = self
+      tableView.register(UITableViewCell.self, forCellReuseIdentifier: "Cell")
+    }
+  }
 
   let viewModel = DemoViewModel(networking: GitHubProvider)
 
   var repos = [Repository]()
 
   override func viewDidLoad() {
     super.viewDidLoad()
-    self.tableView.dataSource = self
-    self.tableView.delegate = self
     initializeViewModel()
   }
 

Sample/Demo-ReactiveSwift/DemoViewModel.swift

@@ -9,6 +9,8 @@
 import Foundation
 import Moya
 import Moya_ObjectMapper
+import Moya_ReactiveSwift_ObjectMapper
+import ReactiveMoya
 import ReactiveSwift
 
 class ReactiveDemoViewModel: ReactiveExtensionsProvider {

Sample/Demo-ReactiveSwift/Reactive+DemoViewModel.swift

@@ -9,6 +9,8 @@
 import Foundation
 import Moya
 import Moya_ObjectMapper
+import Moya_ReactiveSwift_ObjectMapper
+import ReactiveMoya
 import ReactiveSwift
 
 extension Reactive where Base: ReactiveDemoViewModel {

Sample/Demo-ReactiveSwift/ViewController.swift

@@ -30,14 +30,14 @@ class ViewController: UIViewController {
   }
 
   fileprivate func initializeViewModel() {
-    viewModel.downloadZenSignal.observeValues { [weak self] result in
+    viewModel.downloadZenSignal.take(during: reactive.lifetime).observeValues { [weak self] result in
       switch result {
       case .success(let value): self?.showMessage(message: value)
       case .failure(let error): self?.showError(error: error)
       }
     }
 
-    viewModel.downloadRepoSignal.observeValues { [weak self] result in
+    viewModel.downloadRepoSignal.take(during: reactive.lifetime).observeValues { [weak self] result in
       switch result {
       case .success: break
       case .failure: self?.presentUsernamePrompt()

Sample/Demo-RxSwift/Rx+DemoViewModel.swift

@@ -9,6 +9,8 @@
 import Foundation
 import Moya
 import Moya_ObjectMapper
+import Moya_RxSwift_ObjectMapper
+import RxMoya
 import RxSwift
 
 extension Reactive where Base: RxDemoViewModel {