Merge pull request #1753 from Moya/development

[Release] Moya 12.0

.circleci/config.yml

@@ -1,36 +1,55 @@
 version: 2
+defaults: &defaults
+  macos:
+    xcode: '10.0.0'
+  parallelism: 1
+  shell: /bin/bash --login    
+  environment:
+    CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+    CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+    LANG: en_US.UTF-8
+    BUNDLE_PATH: vendor/bundle
 jobs:
+  carthage_without_swiftlint_integration:
+    <<: *defaults
+    working_directory: ~/Moya/Moya_Carthage_1
+    steps:
+      - checkout
+      - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
+      - restore_cache:
+          keys:
+            - v1-carthage-no-swiftlint-deps-{{ checksum "Cartfile.resolved" }}
+      - run:
+          name: Set Ruby Version
+          command: echo "ruby-2.4" > ~/.ruby-version
+      - run:
+          name: Update Homebrew
+          command: brew update    
+      - run:
+          name: Carthage checkout
+          command: carthage checkout
+      - run:
+          name: Test Carthage Build before installing SwiftLint
+          command: carthage build --no-skip-current --cache-builds --no-use-binaries --verbose             
+      - save_cache:
+          key: v1-carthage-no-swiftlint-deps-{{ checksum "Cartfile.resolved" }}
+          paths:
+            - Carthage               
   build:
+    <<: *defaults
     working_directory: ~/Moya/Moya
-    parallelism: 1
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      LANG: en_US.UTF-8
-      BUNDLE_PATH: vendor/bundle
-    macos:
-      xcode: '9.2.0'
     steps:
       - checkout
       - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
       - restore_cache:
           keys:
-            - v1-dep-{{ .Branch }}-
-            - v1-dep-master-
-            - v1-dep-
+            - v1-dep-{{ checksum "Cartfile.resolved" }}
       - run:
           name: Set Ruby Version
           command: echo "ruby-2.4" > ~/.ruby-version
-      - run: 
-          name: Fetch CocoaPods Specs
-          command: curl -sS https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash
       - run:
           name: Update Homebrew
           command: brew update
-      - run:
-          name: Test Carthage Build before installing SwiftLint
-          command: carthage build --no-skip-current --cache-builds
       - run:
           name: Install Swiftlint
           command: brew install swiftlint
@@ -44,7 +63,7 @@ jobs:
           name: Bootstrap Carthage
           command: scripts/bootstrap-if-needed.sh
       - save_cache:
-          key: v1-dep-{{ .Branch }}-{{ epoch }}
+          key: v1-dep-{{ checksum "Cartfile.resolved" }}
           paths:
             - vendor/bundle
             - Carthage
@@ -78,3 +97,9 @@ jobs:
           path: /tmp/circleci-artifacts
       - store_artifacts:
           path: /tmp/circleci-test-results
+workflows:
+  version: 2
+  pr_build:
+    jobs:
+      - build
+      - carthage_without_swiftlint_integration

Cartfile

@@ -1,4 +1,4 @@
 github "Alamofire/Alamofire" ~> 4.1
-github "ReactiveCocoa/ReactiveSwift" ~> 3.0
+github "ReactiveCocoa/ReactiveSwift" ~> 4.0
 github "ReactiveX/RxSwift" ~> 4.0
-github "antitypical/Result" ~> 3.1
+github "antitypical/Result" ~> 4.0

Cartfile.resolved

@@ -1,7 +1,7 @@
-github "Alamofire/Alamofire" "4.7.1"
+github "Alamofire/Alamofire" "4.7.3"
 github "AliSoftware/OHHTTPStubs" "f90c2bb0fb882e43761ab963ca8869d349d2c6e3"
-github "Quick/Nimble" "v7.0.3"
-github "Quick/Quick" "v1.2.0"
-github "ReactiveCocoa/ReactiveSwift" "3.1.0"
-github "ReactiveX/RxSwift" "4.1.2"
-github "antitypical/Result" "3.2.4"
+github "Quick/Nimble" "v7.1.3"
+github "Quick/Quick" "v1.3.1"
+github "ReactiveCocoa/ReactiveSwift" "4.0.0"
+github "ReactiveX/RxSwift" "4.3.1"
+github "antitypical/Result" "4.0.0"

Changelog.md

@@ -1,8 +1,24 @@
 # Next
 
 ### Changed
+- **Breaking Change** watchOS deployment target for RxMoya is now 3.0. [#1758](https://github.com/Moya/Moya/pull/1758) by [@simonrice](https://github.com/simonrice).
+- Fix warnings generated by Xcode 10. Updated project to Swift 4.2 
+  [#1740](https://github.com/Moya/Moya/pull/1740) by [@lexorus](https://github.com/lexorus)
+
+# [12.0.0-beta.1] - 2018-08-07
+
+### Added
+- **Breaking Change** Added `.custom(String)` authorization case to `AuthorizationType` inside `AccessTokenPlugin`. [#1611](https://github.com/Moya/Moya/pull/1611) by [@SeRG1k17](https://github.com/SeRG1k17).
+
+### Changed
+- **Breaking Change** Minimum version of `ReactiveSwift` is now 4.0. [#1668](https://github.com/Moya/Moya/pull/1668) by [@sunshinejr](https://github.com/sunshinejr).
+
+- **Breaking Change** Minimum version of `Result` is now 4.0. [#1668](https://github.com/Moya/Moya/pull/1668) by [@sunshinejr](https://github.com/sunshinejr).
+
 - **Breaking Change** Changed `Response`s filter method parameter to use a generic `RangeExpression` that accepts any range type. [#1624](https://github.com/Moya/Moya/pull/1624) by [@LucianoPAlmeida](https://github.com/LucianoPAlmeida).
 
+- **Breaking Change** Changed `AccessTokenPlugin`'s initializer to no longer use an `@autoclosure` for the `tokenClosure` parameter. [#1611](https://github.com/Moya/Moya/pull/1611) by [@SeRG1k17](https://github.com/SeRG1k17).
+
 # [11.0.2] - 2018-04-01
 ### Fixed
 - Fixed Carthage compatibility by disabling the SwiftLint build phase in release builds. [#1619](https://github.com/Moya/Moya/pull/1619) by [@Dschee](https://github.com/Dschee).

Gemfile.lock

@@ -1,26 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.6)
+    CFPropertyList (3.0.0)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    atomos (0.1.2)
+    atomos (0.1.3)
     claide (1.0.2)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.4.0)
+    cocoapods (1.5.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.4.0)
+      cocoapods-core (= 1.5.3)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
@@ -30,43 +30,43 @@ GEM
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.4)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.4, < 2.0)
-    cocoapods-core (1.4.0)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.3)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.1.3)
+    cocoapods-downloader (1.2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.0)
+    cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
     concurrent-ruby (1.0.5)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.6.2)
+    danger (5.6.6)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
       faraday-http-cache (~> 1.0)
-      git (~> 1)
+      git (~> 1.5)
       kramdown (~> 1.5)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    danger-swiftlint (0.13.1)
+    danger-swiftlint (0.17.3)
       danger
       rake (> 10)
       thor (~> 0.19)
@@ -79,25 +79,25 @@ GEM
       faraday (~> 0.8)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.1.2)
-    git (1.4.0)
+    gh_inspector (1.1.3)
+    git (1.5.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     kramdown (1.17.0)
     minitest (5.11.3)
-    molinillo (0.6.4)
+    molinillo (0.6.6)
     multipart-post (2.0.0)
-    nanaimo (0.2.3)
+    nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    octokit (4.9.0)
+    octokit (4.11.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (3.0.2)
-    rake (12.3.0)
+    public_suffix (3.0.3)
+    rake (12.3.1)
     rouge (2.0.7)
-    ruby-macho (1.1.0)
+    ruby-macho (1.2.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
@@ -108,15 +108,15 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.4.0)
-    xcodeproj (1.5.6)
-      CFPropertyList (~> 2.3.3)
-      atomos (~> 0.1.2)
+    xcodeproj (1.6.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
-    xcpretty (0.2.8)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
       rouge (~> 2.0.7)
-    xcpretty-json-formatter (0.1.0)
+    xcpretty-json-formatter (0.1.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS

Moya.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Moya"
-  s.version      = "11.0.2"
+  s.version      = "12.0.0-beta.1"
   s.summary      = "Network abstraction layer written in Swift"
   s.description  = <<-EOS
   Moya abstracts network commands using Swift Generics to provide developers
@@ -19,23 +19,26 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '9.0'
   s.source       = { :git => "https://github.com/Moya/Moya.git", :tag => s.version }
   s.default_subspec = "Core"
+  s.swift_version = '4.2'
+  s.cocoapods_version = '>= 1.4.0'  
 
   s.subspec "Core" do |ss|
     ss.source_files  = "Sources/Moya/", "Sources/Moya/Plugins/"
     ss.dependency "Alamofire", "~> 4.1"
-    ss.dependency "Result", "~> 3.0"
+    ss.dependency "Result", "~> 4.0"
     ss.framework  = "Foundation"
   end
 
   s.subspec "ReactiveSwift" do |ss|
     ss.source_files = "Sources/ReactiveMoya/"
     ss.dependency "Moya/Core"
-    ss.dependency "ReactiveSwift", "~> 3.0"
+    ss.dependency "ReactiveSwift", "~> 4.0"
   end
 
   s.subspec "RxSwift" do |ss|
     ss.source_files = "Sources/RxMoya/"
     ss.dependency "Moya/Core"
     ss.dependency "RxSwift", "~> 4.0"
+    ss.watchos.deployment_target = '3.0'
   end
 end