Skip to content

Commit 57a7e4b

Browse files
Merge pull request #110 from dbsystel/develop
Release 3.0
2 parents 245034c + e204e62 commit 57a7e4b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+833
-1124
lines changed

.github/workflows/build.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
on: push
2+
name: Build
3+
jobs:
4+
test:
5+
name: Build
6+
runs-on: macOS-latest
7+
steps:
8+
- name: Checkout
9+
uses: actions/checkout@v2
10+
with:
11+
ref: ${{ github.ref }}
12+
- name: Build and test
13+
run: swift test

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ xcuserdata/
2020
## Other
2121
*.moved-aside
2222
*.xcuserstate
23+
.DS_Store
2324

2425
## Obj-C/Swift specific
2526
*.hmap

.travis.yml

-40
This file was deleted.

DBNetworkStack.xcodeproj/project.pbxproj

-689
This file was deleted.

DBNetworkStack.xcodeproj/project.xcworkspace/contents.xcworkspacedata

-7
This file was deleted.

DBNetworkStack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

-8
This file was deleted.

DBNetworkStack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

-5
This file was deleted.

DBNetworkStack.xcodeproj/xcshareddata/xcschemes/DBNetworkStack.xcscheme

-100
This file was deleted.

DBNetworkStack.xcodeproj/xcuserdata/lukaslaschmidt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

-5
This file was deleted.

DBNetworkStack.xcodeproj/xcuserdata/lukaslaschmidt.xcuserdatad/xcschemes/xcschememanagement.plist

-27
This file was deleted.

DBNetworkStack.xcworkspace/contents.xcworkspacedata

-13
This file was deleted.

DBNetworkStack.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

-8
This file was deleted.

DBNetworkStack.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

-5
This file was deleted.

JSONExample.playground/Contents.swift

-25
This file was deleted.

JSONExample.playground/contents.xcplayground

-4
This file was deleted.

Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.0
1+
// swift-tools-version:5.5
22
//
33
// Package.swift
44
//

README.md

+6-9
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
[![Build Status](https://travis-ci.org/dbsystel/DBNetworkStack.svg?branch=develop)](https://travis-ci.org/dbsystel/DBNetworkStack)
44
[![codebeat badge](https://codebeat.co/badges/e438e768-249d-4e9f-8dd8-32928537740e)](https://codebeat.co/projects/github-com-dbsystel-dbnetworkstack-develop)
55
[![codecov](https://codecov.io/gh/dbsystel/DBNetworkStack/branch/develop/graph/badge.svg)](https://codecov.io/gh/dbsystel/DBNetworkStack)
6-
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
76
[![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
8-
[![Version](https://img.shields.io/cocoapods/v/DBNetworkStack.svg?style=flat)](http://cocoapods.org/pods/DBNetworkStack)
97

108
| | Main Features |
119
| --------- | ------------------------------ |
@@ -95,23 +93,22 @@ The following table shows all the protocols and their default implementations.
9593
| -------------------------------- | ---------------------- |
9694
| ```RetryNetworkService``` | Retrys requests after a given delay when an error meets given criteria. |
9795
| ```ModifyRequestNetworkService``` | Modify matching requests. Can be used to add auth tokens or API Keys |
96+
| ```NetworkServiceMock``` | Mocks a NetworkService. Can be use during unit tests |
9897

9998
## Requirements
10099

101100
- iOS 9.0+ / macOS 10.10+ / tvOS 9.0+ / watchOS 2.0+
102-
- Xcode 10.2+
103-
- Swift 5.0
104101

105102
## Installation
106103

107-
### Carthage
104+
### Swift Package Manager
108105

109-
[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
106+
[SPM](https://swift.org/package-manager/) is integrated with the Swift build system to automate the process of downloading, compiling, and linking dependencies.
110107

111-
Specify the following in your `Cartfile`:
108+
Specify the following in your `Package.swift`:
112109

113-
```ogdl
114-
github "dbsystel/dbnetworkstack" ~> 2.0
110+
```swift
111+
.package(url: "https://github.com/dbsystel/DBNetworkStack", from: "2.1.0"),
115112
```
116113

117114
## Contributing

SimpleDemo.playground/Contents.swift

-21
This file was deleted.

SimpleDemo.playground/contents.xcplayground

-4
This file was deleted.

Source/DBNetworkStack.h

-34
This file was deleted.

0 commit comments

Comments
 (0)