RxSwift 5.0.0 support (#146)

RxSwift 5.0.0 support

.circleci/config.yml

@@ -13,23 +13,20 @@ jobs:
       - checkout
       - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS $XCODE_TEST_REPORTS
       - restore_cache:
-          keys:
-            - v1-dep-{{ .Branch }}-
-            - v1-dep-master-
-            - v1-dep-
-      - run: 
-          name: Bootstrap Carthage
-          command: scripts/bootstrap-if-needed.sh
+          key: RxAlamofire-Test-Carthage-Dependency
+      - run:
+          name: Install Carthage
+          command: set -o pipefail && carthage update --cache-builds --new-resolver --configuration Debug
       - save_cache:
-          key: v1-dep-{{ .Branch }}-{{ epoch }}
-          paths:
+          paths: 
             - Carthage
+          key: RxAlamofire-Test-Carthage-Dependency
       - run:
           name: Run Tests (Swift 4.2)
-          command: set -o pipefail && xcodebuild test SWIFT_VERSION=4.2 -scheme 'RxAlamofireTests' -workspace 'RxAlamofire/RxAlamofire.xcworkspace' -sdk iphonesimulator -destination "name=iPhone 8" | xcpretty -c -r html --output $XCODE_TEST_REPORTS/iOS_Swift4_2.html
+          command: set -o pipefail && xcodebuild test SWIFT_VERSION=4.2 -scheme 'RxAlamofire iOS' -project '_.xcodeproj' -sdk iphonesimulator -destination "name=iPhone X" | xcpretty -c -r html --output $XCODE_TEST_REPORTS/iOS_Swift42.html
       - run:
           name: Run Tests (Swift 5)
-          command: set -o pipefail && xcodebuild test SWIFT_VERSION=5.0 -scheme 'RxAlamofireTests' -workspace 'RxAlamofire/RxAlamofire.xcworkspace' -sdk iphonesimulator -destination "name=iPhone 8" | xcpretty -c -r html --output $XCODE_TEST_REPORTS/iOS_Swift5.html
+          command: set -o pipefail && xcodebuild test SWIFT_VERSION=5.0 -scheme 'RxAlamofire iOS' -project '_.xcodeproj' -sdk iphonesimulator -destination "name=iPhone X" | xcpretty -c -r html --output $XCODE_TEST_REPORTS/iOS_Swift5.html
       - store_artifacts:
           path: /tmp/xcode-test-results
   "RxAlamofire Release":

CHANGELOG.md

@@ -9,6 +9,14 @@ All notable changes to this project will be documented in this file.
 
 #### Fixed
 
+## 5.0.0
+
+#### Updated
+* Support macOS and watchOS through Carthage 
+* Added Example projects for macOS and watchOS 
+* Uses RxSwift 5.0.0
+* Upgrade project to Swift 5.0
+
 ## 4.5.0
 
 #### Fixed

Cartfile

@@ -1,2 +1,2 @@
-github "ReactiveX/RxSwift" ~> 4.5
+github "ReactiveX/RxSwift" ~> 5.0
 github "Alamofire/Alamofire" ~> 4.8

Cartfile.private

@@ -0,0 +1 @@
+github "AliSoftware/OHHTTPStubs" ~> 8.0

Cartfile.resolved

@@ -1,2 +1,3 @@
 github "Alamofire/Alamofire" "4.8.2"
-github "ReactiveX/RxSwift" "4.5.0"
+github "AliSoftware/OHHTTPStubs" "8.0.0"
+github "ReactiveX/RxSwift" "5.0.1"

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'cocoapods', '~> 1.6'

Gemfile.lock

@@ -0,0 +1,76 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    atomos (0.1.3)
+    claide (1.0.2)
+    cocoapods (1.6.1)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.6.1)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.2.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.6.6)
+      nap (~> 1.0)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.8.1, < 2.0)
+    cocoapods-core (1.6.1)
+      activesupport (>= 4.0.2, < 6)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.2.2)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.1.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.1.5)
+    escape (0.0.4)
+    fourflusher (2.2.0)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
+    nap (1.1.0)
+    netrc (0.11.0)
+    ruby-macho (1.4.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    xcodeproj (1.9.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods (~> 1.6)
+
+BUNDLED WITH
+   2.0.1

README.md

@@ -172,7 +172,7 @@ pod 'RxAlamofire'
 Add following to `Cartfile`:
 
 ```
-github "RxSwiftCommunity/RxAlamofire" ~> 4.4
+github "RxSwiftCommunity/RxAlamofire" ~> 5.0
 ```
 
 ### Swift Package manager
@@ -207,4 +207,6 @@ To manual install this extension you should get the `RxAlamofire/Source/RxAlamof
 
 ## Requirements
 
-RxAlamofire requires Swift 5.0 and dedicated versions of Alamofire (4.8.2) and RxSwift (4.5.0).
+RxAlamofire requires Swift 5.0 and dedicated versions of Alamofire (4.8.2) and RxSwift (5.0.0).
+
+For the last Swift 4.2 support, please use RxAlamofire 4.5.0.

RxAlamofire-macOS/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 RxSwiftCommunity. All rights reserved.</string>
+</dict>
+</plist>

RxAlamofire-macOS/RxAlamofire_macOS.h

@@ -0,0 +1,19 @@
+//
+//  RxAlamofire_macOS.h
+//  RxAlamofire macOS
+//
+//  Created by Ryne Cheow on 19/4/19.
+//  Copyright © 2019 RxSwiftCommunity. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+//! Project version number for RxAlamofire_macOS.
+FOUNDATION_EXPORT double RxAlamofire_macOSVersionNumber;
+
+//! Project version string for RxAlamofire_macOS.
+FOUNDATION_EXPORT const unsigned char RxAlamofire_macOSVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <RxAlamofire_macOS/PublicHeader.h>
+
+

RxAlamofire-watchOS/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>

RxAlamofire-watchOS/RxAlamofire_watchOS.h

@@ -0,0 +1,19 @@
+//
+//  RxAlamofire_watchOS.h
+//  RxAlamofire watchOS
+//
+//  Created by Ryne Cheow on 19/4/19.
+//  Copyright © 2019 RxSwiftCommunity. All rights reserved.
+//
+
+#import <WatchKit/WatchKit.h>
+
+//! Project version number for RxAlamofire_watchOS.
+FOUNDATION_EXPORT double RxAlamofire_watchOSVersionNumber;
+
+//! Project version string for RxAlamofire_watchOS.
+FOUNDATION_EXPORT const unsigned char RxAlamofire_watchOSVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <RxAlamofire_watchOS/PublicHeader.h>
+
+

RxAlamofire.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name = "RxAlamofire"
 
-  s.version = "4.5.0"
+  s.version = "5.0.0"
   s.license = "MIT"
   s.summary = "RxSwift wrapper around the elegant HTTP networking in Swift Alamofire"
   s.homepage = "https://github.com/RxSwiftCommunity/RxAlamofire"
   s.authors = { "RxSwift Community" => "community@rxswift.org" }
   s.source = { :git => "https://github.com/RxSwiftCommunity/RxAlamofire.git", :tag => s.version }
-  s.swift_version = "4.2"
+  s.swift_version = "5.0"
 
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.10"
@@ -20,14 +20,14 @@ Pod::Spec.new do |s|
 
   s.subspec "Core" do |ss|
     ss.source_files = "Sources/*.swift"
-    ss.dependency "RxSwift", "~> 4.5"
+    ss.dependency "RxSwift", "~> 5.0"
     ss.dependency "Alamofire", "~> 4.8"
     ss.framework = "Foundation"
   end
 
   s.subspec "RxCocoa" do |ss|
     ss.source_files = "Sources/Cocoa/*.swift"
-    ss.dependency "RxCocoa", "~> 4.5"
+    ss.dependency "RxCocoa", "~> 5.0"
     ss.dependency "RxAlamofire/Core"
   end
 end

RxAlamofire/Podfile

@@ -1,37 +1,38 @@
 source "https://github.com/CocoaPods/Specs.git"
 
 use_frameworks!
+platform :ios, "9.0"
 
 def common
   pod "Alamofire", "~> 4.8"
-  pod "RxSwift", "~> 4.5"
-  pod "RxCocoa", "~> 4.5"
+  pod "RxSwift", "~> 5.0"
+  pod "RxCocoa", "~> 5.0"
+end
+
+target "RxAlamofire-iOS" do
+  common
 end
 
 target "RxAlamofire-iOS-Example" do
-  platform :ios, "9.0"
   common
 end
 
-target "RxAlamofire-tvOS-Example" do
+target "RxAlamofire-tvOS" do
   platform :tvos, "9.0"
   common
 end
 
-target "RxAlamofire-iOS" do
-  platform :ios, "9.0"
+target "RxAlamofire-tvOS-Example" do
+  platform :tvos, "9.0"
   common
 end
 
-target "RxAlamofireTests" do
-  platform :ios, "9.0"
+target "RxAlamofire-watchOS" do
+  platform :watchos, "3.0"
   common
-  pod "OHHTTPStubs", "~> 7.0"
-  pod "OHHTTPStubs/Swift", "~> 7.0"
-  pod "RxBlocking", "~> 4.5"
 end
 
-target "RxAlamofire-tvOS" do
-  platform :tvos, "9.0"
+target "RxAlamofire-macOS" do
+  platform :osx, "10.10"
   common
 end

RxAlamofire/Podfile.lock

@@ -1,49 +1,30 @@
 PODS:
-  - Alamofire (4.8.1)
-  - OHHTTPStubs (7.0.0):
-    - OHHTTPStubs/Default (= 7.0.0)
-  - OHHTTPStubs/Core (7.0.0)
-  - OHHTTPStubs/Default (7.0.0):
-    - OHHTTPStubs/Core
-    - OHHTTPStubs/JSON
-    - OHHTTPStubs/NSURLSession
-    - OHHTTPStubs/OHPathHelpers
-  - OHHTTPStubs/JSON (7.0.0):
-    - OHHTTPStubs/Core
-  - OHHTTPStubs/NSURLSession (7.0.0):
-    - OHHTTPStubs/Core
-  - OHHTTPStubs/OHPathHelpers (7.0.0)
-  - OHHTTPStubs/Swift (7.0.0):
-    - OHHTTPStubs/Default
-  - RxBlocking (4.5.0):
-    - RxSwift (>= 4.4.2, ~> 4.4)
-  - RxCocoa (4.5.0):
-    - RxSwift (>= 4.4.2, ~> 4.4)
-  - RxSwift (4.5.0)
+  - Alamofire (4.8.2)
+  - RxCocoa (5.0.0):
+    - RxRelay (~> 5)
+    - RxSwift (~> 5)
+  - RxRelay (5.0.0):
+    - RxSwift (~> 5)
+  - RxSwift (5.0.0)
 
 DEPENDENCIES:
   - Alamofire (~> 4.8)
-  - OHHTTPStubs (~> 7.0)
-  - OHHTTPStubs/Swift (~> 7.0)
-  - RxBlocking (~> 4.5)
-  - RxCocoa (~> 4.5)
-  - RxSwift (~> 4.5)
+  - RxCocoa (~> 5.0)
+  - RxSwift (~> 5.0)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - Alamofire
-    - OHHTTPStubs
-    - RxBlocking
     - RxCocoa
+    - RxRelay
     - RxSwift
 
 SPEC CHECKSUMS:
-  Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
-  OHHTTPStubs: ef33a2c353110d306bb98f695435ec56ff5a26c3
-  RxBlocking: 79413e4d916f44bb3e113c5b2cc059e36fe58910
-  RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
-  RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
+  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
+  RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
+  RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
+  RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
 
-PODFILE CHECKSUM: cc3ce8b94377bef0497f6cb01e1e70079c3bad97
+PODFILE CHECKSUM: 078e2c3588728fed6591aca19e86edbd8ee247ec
 
 COCOAPODS: 1.6.1