Merge pull request infinum#12 from infinum/feature/moya

This commit addresses proposal infinum#11 to add support for Moya

Example/Japx.xcodeproj/project.pbxproj

@@ -318,7 +318,6 @@
  607FACCD1AFB9204008FA782 /* Frameworks */,
  607FACCE1AFB9204008FA782 /* Resources */,
  96D02A5ECB10B9C3FD14051B /* [CP] Embed Pods Frameworks */,
- 78CFFA8D2659DE60E07D1809 /* [CP] Copy Pods Resources */,
  );
  buildRules = (
  );
@@ -338,7 +337,6 @@
  607FACE21AFB9204008FA782 /* Frameworks */,
  607FACE31AFB9204008FA782 /* Resources */,
  C1B5BB1EF527CE5CA3158537 /* [CP] Embed Pods Frameworks */,
- 57C5F4BE81E7BAB86A782D47 /* [CP] Copy Pods Resources */,
  );
  buildRules = (
  );
@@ -357,7 +355,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0830;
- LastUpgradeCheck = 0930;
+ LastUpgradeCheck = 0940;
  ORGANIZATIONNAME = CocoaPods;
  TargetAttributes = {
  607FACCF1AFB9204008FA782 = {
@@ -445,36 +443,6 @@
  shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
  showEnvVarsInLog = 0;
  };
- 57C5F4BE81E7BAB86A782D47 /* [CP] Copy Pods Resources */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "[CP] Copy Pods Resources";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests-resources.sh\"\n";
- showEnvVarsInLog = 0;
- };
- 78CFFA8D2659DE60E07D1809 /* [CP] Copy Pods Resources */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "[CP] Copy Pods Resources";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Japx_Example/Pods-Japx_Example-resources.sh\"\n";
- showEnvVarsInLog = 0;
- };
  8E3A6C4DC2C586DFBC4BD045 /* [CP] Check Pods Manifest.lock */ = {
  isa = PBXShellScriptBuildPhase;
  buildActionMask = 2147483647;
@@ -502,12 +470,16 @@
  "${SRCROOT}/Pods/Target Support Files/Pods-Japx_Example/Pods-Japx_Example-frameworks.sh",
  "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
  "${BUILT_PRODUCTS_DIR}/Japx/Japx.framework",
+ "${BUILT_PRODUCTS_DIR}/Moya/Moya.framework",
+ "${BUILT_PRODUCTS_DIR}/Result/Result.framework",
  "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
  );
  name = "[CP] Embed Pods Frameworks";
  outputPaths = (
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Japx.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Moya.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Result.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
  );
  runOnlyForDeploymentPostprocessing = 0;

Example/Japx.xcworkspace/xcshareddata/xcschemes/Japx.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0930"
+ LastUpgradeVersion = "0940"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
  buildForAnalyzing = "YES">
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "12B24240C4358F90D4E62CD52D23F563"
+ BlueprintIdentifier = "8F818005A1B87363C37C5C29C52CE3BE"
  BuildableName = "Japx.framework"
  BlueprintName = "Japx"
  ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -42,7 +42,7 @@
  <MacroExpansion>
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "12B24240C4358F90D4E62CD52D23F563"
+ BlueprintIdentifier = "8F818005A1B87363C37C5C29C52CE3BE"
  BuildableName = "Japx.framework"
  BlueprintName = "Japx"
  ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -64,7 +64,7 @@
  <MacroExpansion>
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "12B24240C4358F90D4E62CD52D23F563"
+ BlueprintIdentifier = "8F818005A1B87363C37C5C29C52CE3BE"
  BuildableName = "Japx.framework"
  BlueprintName = "Japx"
  ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -82,7 +82,7 @@
  <MacroExpansion>
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "12B24240C4358F90D4E62CD52D23F563"
+ BlueprintIdentifier = "8F818005A1B87363C37C5C29C52CE3BE"
  BuildableName = "Japx.framework"
  BlueprintName = "Japx"
  ReferencedContainer = "container:Pods/Pods.xcodeproj">

Example/Japx.xcworkspace/xcshareddata/xcschemes/JapxExample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0930"
+ LastUpgradeVersion = "0940"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

Example/Podfile

@@ -2,7 +2,7 @@ platform :ios, '9.0'
 use_frameworks!
 
 target 'Japx_Example' do
- pod 'Japx/RxCodableAlamofire', :path => '../'
+ pod 'Japx/RxCodableMoya', :path => '../'
 
  target 'Japx_Tests' do
  inherit! :search_paths

Example/Podfile.lock

@@ -1,40 +1,59 @@
 PODS:
- - Alamofire (4.7.0)
- - Japx/Alamofire (1.0.0):
- - Alamofire (~> 4.5)
+ - Alamofire (4.7.3)
+ - Japx/Codable (1.0.2):
  - Japx/Core
- - Japx/Codable (1.0.0):
- - Japx/Core
- - Japx/CodableAlamofire (1.0.0):
- - Japx/Alamofire
+ - Japx/CodableMoya (1.0.2):
  - Japx/Codable
- - Japx/Core (1.0.0)
- - Japx/RxAlamofire (1.0.0):
- - Japx/Alamofire
+ - Japx/Core
+ - Japx/Moya
+ - Japx/Core (1.0.2)
+ - Japx/Moya (1.0.2):
+ - Japx/Core
+ - Moya/RxSwift (~> 11.0)
+ - Japx/RxCodableMoya (1.0.2):
+ - Japx/CodableMoya
+ - Japx/Core
+ - Japx/RxMoya
+ - Japx/RxMoya (1.0.2):
+ - Japx/Moya
+ - Moya/Core (11.0.2):
+ - Alamofire (~> 4.1)
+ - Result (~> 3.0)
+ - Moya/RxSwift (11.0.2):
+ - Moya/Core
  - RxSwift (~> 4.0)
- - Japx/RxCodableAlamofire (1.0.0):
- - Japx/CodableAlamofire
- - Japx/RxAlamofire
  - Nimble (7.0.3)
  - Quick (1.2.0)
- - RxSwift (4.1.2)
+ - Result (3.2.4)
+ - RxSwift (4.2.0)
 
 DEPENDENCIES:
- - Japx/RxCodableAlamofire (from `../`)
+ - Japx/RxCodableMoya (from `../`)
  - Nimble (~> 7.0.2)
  - Quick (~> 1.2.0)
 
+SPEC REPOS:
+ https://github.com/cocoapods/specs.git:
+ - Alamofire
+ - Moya
+ - Nimble
+ - Quick
+ - Result
+ - RxSwift
+
 EXTERNAL SOURCES:
  Japx:
- :path: ../
+ :path: "../"
 
 SPEC CHECKSUMS:
- Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25
- Japx: 1565d63a2fad537f6213956702cbc51cc20ea656
+ Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
+ Japx: 08b7b2d2bc7a378c9e28e9f56c6e4bc48a0e54da
+ Moya: a725035953bc1c0eb1be505ab903984501d82440
  Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
  Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
- RxSwift: e49536837d9901277638493ea537394d4b55f570
+ Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
+ RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104
 
-PODFILE CHECKSUM: 98601fe2b9583a38fcc317df035455d25482a5c8
+PODFILE CHECKSUM: e4775c503c3da317938d070d15dc4acc1a5c8e6f
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.2