Skip to content

Commit

Permalink
Merge branch 'main' into feature/url-query-as-KeyValuePairs
Browse files Browse the repository at this point in the history
  • Loading branch information
mkj-is committed Jan 26, 2021
2 parents 689dc3b + 2ea8587 commit 084abcb
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: |
gem install bundler
bundle install --jobs 4 --retry 3
bundle exec pod lib lint
bundle exec pod lib lint --allow-warnings
- name: Swift build & test
run: |
swift build
Expand Down
4 changes: 2 additions & 2 deletions FTAPIKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "FTAPIKit"
s.version = "1.1.2"
s.version = "1.2.0"
s.summary = "Declarative, generic and protocol-oriented REST API framework using URLSession and Codable"
s.description = <<-DESC
Protocol-oriented framework for communication with REST APIs.
Expand All @@ -20,7 +20,7 @@ Pod::Spec.new do |s|
s.weak_frameworks = ["Combine"]

s.swift_version = "5.1"
s.ios.deployment_target = "8.0"
s.ios.deployment_target = "9.0"
s.osx.deployment_target = "10.10"
s.watchos.deployment_target = "5.0"
s.tvos.deployment_target = "12.0"
Expand Down
51 changes: 27 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (4.2.11.3)
i18n (~> 0.7)
CFPropertyList (3.0.3)
activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.9.3)
activesupport (>= 4.0.2, < 5)
cocoapods (1.10.1)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.3)
cocoapods-core (= 1.10.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-downloader (>= 1.4.0, < 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.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
Expand All @@ -30,55 +31,57 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.3)
activesupport (>= 4.0.2, < 6)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.8)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.13.1)
ffi (1.14.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (0.9.5)
i18n (1.8.7)
concurrent-ruby (~> 1.0)
json (2.3.1)
minitest (5.14.1)
json (2.5.1)
minitest (5.14.3)
molinillo (0.6.6)
nanaimo (0.2.6)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.6)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
tzinfo (1.2.9)
thread_safe (~> 0.1)
xcodeproj (1.17.0)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)
nanaimo (~> 0.3.0)

PLATFORMS
ruby
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ When using Swift package manager install using Xcode 11+
or add following line to your dependencies:

```swift
.package(url: "https://github.com/futuredapp/FTAPIKit.git", from: "1.1.2")
.package(url: "https://github.com/futuredapp/FTAPIKit.git", from: "1.2.0")
```

When using CocoaPods add following line to your `Podfile`:

```ruby
pod 'FTAPIKit', '~> 1.1'
pod 'FTAPIKit', '~> 1.2'
```

## Features
Expand Down
16 changes: 0 additions & 16 deletions Tests/FTAPIKitTests/ResponseTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -214,20 +214,4 @@ final class ResponseTests: XCTestCase {
}
wait(for: [expectation], timeout: timeout)
}

static var allTests = [
("testGet", testGet),
("testClientError", testClientError),
("testServerError", testServerError),
("testConnectionError", testConnectionError),
("testEmptyResult", testEmptyResult),
("testCustomError", testCustomError),
("testValidJSONResponse", testValidJSONResponse),
("testValidJSONRequestResponse", testValidJSONRequestResponse),
("testInvalidJSONRequestResponse", testInvalidJSONRequestResponse),
("testAuthorization", testAuthorization),
("testMultipartData", testMultipartData),
("testUploadTask", testUploadTask),
("testDownloadTask", testDownloadTask)
]
}
6 changes: 0 additions & 6 deletions Tests/LinuxMain.swift

This file was deleted.

0 comments on commit 084abcb

Please sign in to comment.