Features/swift package manager (#5)

* just return httpResponse

* Refactor, added URLSessionConfiguration as initializer parameter and added RawResponse model.

* update Example

* update gitignore for swift

* added swift package manager support

* update Example

* just ignore the swift package test for now

* update .travis

Author: michaelhenry

.gitignore

@@ -1,8 +1,14 @@
 # OS X
 .DS_Store
-
 # Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData/
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -12,22 +18,54 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata/
-*.xccheckout
-profile
+
+## Other
 *.moved-aside
-DerivedData
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
+*.dSYM.zip
+*.dSYM
 
-# Bundler
-.bundle
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
 
-Carthage
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+.build/
+
+# CocoaPods
+#
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-# 
-# Note: if you ignore the Pods directory, make sure to uncomment
-# `pod install` in .travis.yml
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
 #
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
 Example/Pods/

.travis.yml

@@ -9,6 +9,9 @@ jobs:
         - cd Example
         - pod install
         - xcodebuild test -workspace RxRetroSwift.xcworkspace -scheme RxRetroSwift-Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8' -quiet
+    - stage: swift package manager
+      script:
+        - swift build
     - stage: deploy to cocoapods
       before_install:
         - echo $TRAVIS_TAG

Example/RxRetroSwift.xcodeproj/project.pbxproj

@@ -105,7 +105,6 @@
 		607FACD21AFB9204008FA782 /* Example for RxRetroSwift */ = {
 			isa = PBXGroup;
 			children = (
-				A60A3D071FFEA30600A2B078 /* Protocols */,
 				A60A3D051FFEA2A900A2B078 /* Models */,
 				A60A3D041FFEA2A300A2B078 /* Services */,
 				A60A3D031FFEA29900A2B078 /* Extensions */,
@@ -189,13 +188,6 @@
 			path = Models;
 			sourceTree = "<group>";
 		};
-		A60A3D071FFEA30600A2B078 /* Protocols */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Protocols;
-			sourceTree = "<group>";
-		};
 		A60A3D131FFFC36D00A2B078 /* RxRetroSwift_Tests */ = {
 			isa = PBXGroup;
 			children = (
@@ -318,16 +310,12 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-RxRetroSwift_Example/Pods-RxRetroSwift_Example-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
-				"${BUILT_PRODUCTS_DIR}/ObjectMapper/ObjectMapper.framework",
 				"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
 				"${BUILT_PRODUCTS_DIR}/RxRetroSwift/RxRetroSwift.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}/ObjectMapper.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRetroSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",

Example/RxRetroSwift/Services/APIClient.swift

@@ -24,7 +24,14 @@ fileprivate extension Encodable {
 class APIClient {
 
   static var shared = APIClient()
-  var caller = RequestCaller.shared
+
+  lazy var caller:RequestCaller = {
+    let config = URLSessionConfiguration.default
+    if #available(iOS 11.0, *) {
+      config.waitsForConnectivity = true
+    }
+    return RequestCaller(config: config)
+  }()
 
   private init() {
 
@@ -96,13 +103,14 @@ class APIClient {
     return caller.call(request)
   }
 
-  func isExist(user userId: Int) -> Observable<Result<Bool, ErrorModel>> {
+  func deleteUser(userId:Int) -> Observable<Result<RawResponse,ErrorModel>> {
 
     let request = RequestModel(
-      httpMethod: .get,
+      httpMethod: .delete,
       path: "users/\(userId)")
       .asURLRequest()
-    return caller.execute(request)
+    
+    return caller.call(request)
   }
 }
 

Example/RxRetroSwift_Tests/RxRetroSwift_Tests.swift

@@ -67,16 +67,6 @@ class TestAPIClient:QuickSpec {
         let observable = apiClient.fetchUsers()
         expect(observable.map { $0.value!.count }).first == 10
       }
-      
-      it("Check a user is exist."){
-        let observable = apiClient.isExist(user: 1)
-        expect(observable.map { $0.value! }).first == true
-      }
-      
-      it("Check a user is not exist."){
-        let observable = apiClient.isExist(user: 1010101)
-        expect(observable.map { $0.error!.errorCode }).first == 404
-      }
     }
   }
 }

Package.resolved

@@ -0,0 +1,28 @@
+// swift-tools-version:4.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "RxRetroSwift",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "RxRetroSwift",
+            targets: ["RxRetroSwift"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", "4.0.0" ..< "5.0.0")
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "RxRetroSwift",
+            dependencies: ["RxSwift", "RxCocoa"]),
+        .testTarget(
+            name: "RxRetroSwiftTests",
+            dependencies: ["RxRetroSwift"]),
+    ]
+)

Package.swift

@@ -29,18 +29,8 @@ Pod::Spec.new do |s|
   s.author           = { 'Michael Henry Pantaleon' => 'me@iamkel.net' }
   s.source           = { :git => 'https://github.com/michaelhenry/RxRetroSwift.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/michaelhenry119'
-
-  s.ios.deployment_target = '8.0'
-
-  s.source_files = 'RxRetroSwift/Classes/**/*'
-  
-  # s.resource_bundles = {
-  #   'RxRetroSwift' => ['RxRetroSwift/Assets/*.png']
-  # }
-
-  # s.public_header_files = 'Pod/Classes/**/*.h'
-  # s.frameworks = 'UIKit', 'MapKit'
-  # s.dependency 'AFNetworking', '~> 2.3'
+  s.ios.deployment_target = '9.0'
+  s.source_files = 'Sources/RxRetroSwift/**/*'
   s.dependency 'RxSwift', '~> 4.0'
   s.dependency 'RxCocoa', '~> 4.0'
 end