Merge pull request #110 from dbsystel/develop

Release 3.0
dbsystel · Jan 11, 2022 · 57a7e4b · 57a7e4b
2 parents 245034c + e204e62
commit 57a7e4b
Show file tree

Hide file tree

Showing 51 changed files with 833 additions and 1,124 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,13 @@
+on: push
+name: Build
+jobs:
+  test:
+    name: Build
+    runs-on: macOS-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+      - name: Build and test
+        run: swift test
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@ xcuserdata/
 ## Other
 *.moved-aside
 *.xcuserstate
+.DS_Store
 
 ## Obj-C/Swift specific
 *.hmap

diff --git a/.travis.yml b/.travis.yml
diff --git a/DBNetworkStack.xcodeproj/project.pbxproj b/DBNetworkStack.xcodeproj/project.pbxproj
diff --git a/DBNetworkStack.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/DBNetworkStack.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/DBNetworkStack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DBNetworkStack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/DBNetworkStack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/DBNetworkStack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/DBNetworkStack.xcodeproj/xcshareddata/xcschemes/DBNetworkStack.xcscheme b/DBNetworkStack.xcodeproj/xcshareddata/xcschemes/DBNetworkStack.xcscheme
diff --git a/...tack.xcodeproj/xcuserdata/lukaslaschmidt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...tack.xcodeproj/xcuserdata/lukaslaschmidt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/...kStack.xcodeproj/xcuserdata/lukaslaschmidt.xcuserdatad/xcschemes/xcschememanagement.plist b/...kStack.xcodeproj/xcuserdata/lukaslaschmidt.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/DBNetworkStack.xcworkspace/contents.xcworkspacedata b/DBNetworkStack.xcworkspace/contents.xcworkspacedata
diff --git a/DBNetworkStack.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DBNetworkStack.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/DBNetworkStack.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/DBNetworkStack.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/JSONExample.playground/Contents.swift b/JSONExample.playground/Contents.swift
diff --git a/JSONExample.playground/contents.xcplayground b/JSONExample.playground/contents.xcplayground
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.5
 //
 //  Package.swift
 //

diff --git a/README.md b/README.md
@@ -3,9 +3,7 @@
 [![Build Status](https://travis-ci.org/dbsystel/DBNetworkStack.svg?branch=develop)](https://travis-ci.org/dbsystel/DBNetworkStack)
 [![codebeat badge](https://codebeat.co/badges/e438e768-249d-4e9f-8dd8-32928537740e)](https://codebeat.co/projects/github-com-dbsystel-dbnetworkstack-develop)
 [![codecov](https://codecov.io/gh/dbsystel/DBNetworkStack/branch/develop/graph/badge.svg)](https://codecov.io/gh/dbsystel/DBNetworkStack)
-[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
-[![Version](https://img.shields.io/cocoapods/v/DBNetworkStack.svg?style=flat)](http://cocoapods.org/pods/DBNetworkStack)
 
 |           | Main Features                  |
 | --------- | ------------------------------ |
@@ -95,23 +93,22 @@ The following table shows all the protocols and their default implementations.
 | -------------------------------- | ---------------------- |
 | ```RetryNetworkService```        | Retrys requests after a given delay when an error meets given criteria. |
 | ```ModifyRequestNetworkService```        | Modify matching requests. Can be used to add auth tokens or API Keys  |
+| ```NetworkServiceMock```        | Mocks a NetworkService. Can be use during unit tests  |
 
 ## Requirements
 
 - iOS 9.0+ / macOS 10.10+ / tvOS 9.0+ / watchOS 2.0+
-- Xcode 10.2+
-- Swift 5.0
 
 ## Installation
 
-### Carthage
+### Swift Package Manager
 
-[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
+[SPM](https://swift.org/package-manager/) is integrated with the Swift build system to automate the process of downloading, compiling, and linking dependencies.
 
-Specify the following in your `Cartfile`:
+Specify the following in your `Package.swift`:
 
-```ogdl
-github "dbsystel/dbnetworkstack" ~> 2.0
+```swift
+.package(url: "https://github.com/dbsystel/DBNetworkStack", from: "2.1.0"),
 ```
 
 ## Contributing

diff --git a/SimpleDemo.playground/Contents.swift b/SimpleDemo.playground/Contents.swift
diff --git a/SimpleDemo.playground/contents.xcplayground b/SimpleDemo.playground/contents.xcplayground
diff --git a/Source/DBNetworkStack.h b/Source/DBNetworkStack.h