Skip to content

Commit 5e5fcf1

Browse files
committed
Merge branch 'main' into housekeep/internal-publisher
2 parents 84f3926 + 2ea8587 commit 5e5fcf1

6 files changed

Lines changed: 32 additions & 51 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run: |
1818
gem install bundler
1919
bundle install --jobs 4 --retry 3
20-
bundle exec pod lib lint
20+
bundle exec pod lib lint --allow-warnings
2121
- name: Swift build & test
2222
run: |
2323
swift build

FTAPIKit.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "FTAPIKit"
3-
s.version = "1.1.2"
3+
s.version = "1.2.0"
44
s.summary = "Declarative, generic and protocol-oriented REST API framework using URLSession and Codable"
55
s.description = <<-DESC
66
Protocol-oriented framework for communication with REST APIs.
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
2020
s.weak_frameworks = ["Combine"]
2121

2222
s.swift_version = "5.1"
23-
s.ios.deployment_target = "8.0"
23+
s.ios.deployment_target = "9.0"
2424
s.osx.deployment_target = "10.10"
2525
s.watchos.deployment_target = "5.0"
2626
s.tvos.deployment_target = "12.0"

Gemfile.lock

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.2)
5-
activesupport (4.2.11.3)
6-
i18n (~> 0.7)
4+
CFPropertyList (3.0.3)
5+
activesupport (5.2.4.4)
6+
concurrent-ruby (~> 1.0, >= 1.0.2)
7+
i18n (>= 0.7, < 2)
78
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
algoliasearch (1.27.3)
10+
addressable (2.7.0)
11+
public_suffix (>= 2.0.2, < 5.0)
12+
algoliasearch (1.27.5)
1113
httpclient (~> 2.8, >= 2.8.3)
1214
json (>= 1.5.1)
1315
atomos (0.1.3)
1416
claide (1.0.3)
15-
cocoapods (1.9.3)
16-
activesupport (>= 4.0.2, < 5)
17+
cocoapods (1.10.1)
18+
addressable (~> 2.6)
1719
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.9.3)
20+
cocoapods-core (= 1.10.1)
1921
cocoapods-deintegrate (>= 1.0.3, < 2.0)
20-
cocoapods-downloader (>= 1.2.2, < 2.0)
22+
cocoapods-downloader (>= 1.4.0, < 2.0)
2123
cocoapods-plugins (>= 1.0.0, < 2.0)
2224
cocoapods-search (>= 1.0.0, < 2.0)
23-
cocoapods-stats (>= 1.0.0, < 2.0)
2425
cocoapods-trunk (>= 1.4.0, < 2.0)
2526
cocoapods-try (>= 1.1.0, < 2.0)
2627
colored2 (~> 3.1)
@@ -30,55 +31,57 @@ GEM
3031
molinillo (~> 0.6.6)
3132
nap (~> 1.0)
3233
ruby-macho (~> 1.4)
33-
xcodeproj (>= 1.14.0, < 2.0)
34-
cocoapods-core (1.9.3)
35-
activesupport (>= 4.0.2, < 6)
34+
xcodeproj (>= 1.19.0, < 2.0)
35+
cocoapods-core (1.10.1)
36+
activesupport (> 5.0, < 6)
37+
addressable (~> 2.6)
3638
algoliasearch (~> 1.0)
3739
concurrent-ruby (~> 1.1)
3840
fuzzy_match (~> 2.0.4)
3941
nap (~> 1.0)
4042
netrc (~> 0.11)
43+
public_suffix
4144
typhoeus (~> 1.0)
4245
cocoapods-deintegrate (1.0.4)
43-
cocoapods-downloader (1.3.0)
46+
cocoapods-downloader (1.4.0)
4447
cocoapods-plugins (1.0.0)
4548
nap
4649
cocoapods-search (1.0.0)
47-
cocoapods-stats (1.1.0)
4850
cocoapods-trunk (1.5.0)
4951
nap (>= 0.8, < 2.0)
5052
netrc (~> 0.11)
5153
cocoapods-try (1.2.0)
5254
colored2 (3.1.2)
53-
concurrent-ruby (1.1.6)
55+
concurrent-ruby (1.1.8)
5456
escape (0.0.4)
5557
ethon (0.12.0)
5658
ffi (>= 1.3.0)
57-
ffi (1.13.1)
59+
ffi (1.14.2)
5860
fourflusher (2.3.1)
5961
fuzzy_match (2.0.4)
6062
gh_inspector (1.1.3)
6163
httpclient (2.8.3)
62-
i18n (0.9.5)
64+
i18n (1.8.7)
6365
concurrent-ruby (~> 1.0)
64-
json (2.3.1)
65-
minitest (5.14.1)
66+
json (2.5.1)
67+
minitest (5.14.3)
6668
molinillo (0.6.6)
67-
nanaimo (0.2.6)
69+
nanaimo (0.3.0)
6870
nap (1.1.0)
6971
netrc (0.11.0)
72+
public_suffix (4.0.6)
7073
ruby-macho (1.4.0)
7174
thread_safe (0.3.6)
7275
typhoeus (1.4.0)
7376
ethon (>= 0.9.0)
74-
tzinfo (1.2.7)
77+
tzinfo (1.2.9)
7578
thread_safe (~> 0.1)
76-
xcodeproj (1.17.0)
79+
xcodeproj (1.19.0)
7780
CFPropertyList (>= 2.3.3, < 4.0)
7881
atomos (~> 0.1.3)
7982
claide (>= 1.0.2, < 2.0)
8083
colored2 (~> 3.1)
81-
nanaimo (~> 0.2.6)
84+
nanaimo (~> 0.3.0)
8285

8386
PLATFORMS
8487
ruby

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ When using Swift package manager install using Xcode 11+
1616
or add following line to your dependencies:
1717

1818
```swift
19-
.package(url: "https://github.com/futuredapp/FTAPIKit.git", from: "1.1.2")
19+
.package(url: "https://github.com/futuredapp/FTAPIKit.git", from: "1.2.0")
2020
```
2121

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

2424
```ruby
25-
pod 'FTAPIKit', '~> 1.1'
25+
pod 'FTAPIKit', '~> 1.2'
2626
```
2727

2828
## Features

Tests/FTAPIKitTests/ResponseTests.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -214,20 +214,4 @@ final class ResponseTests: XCTestCase {
214214
}
215215
wait(for: [expectation], timeout: timeout)
216216
}
217-
218-
static var allTests = [
219-
("testGet", testGet),
220-
("testClientError", testClientError),
221-
("testServerError", testServerError),
222-
("testConnectionError", testConnectionError),
223-
("testEmptyResult", testEmptyResult),
224-
("testCustomError", testCustomError),
225-
("testValidJSONResponse", testValidJSONResponse),
226-
("testValidJSONRequestResponse", testValidJSONRequestResponse),
227-
("testInvalidJSONRequestResponse", testInvalidJSONRequestResponse),
228-
("testAuthorization", testAuthorization),
229-
("testMultipartData", testMultipartData),
230-
("testUploadTask", testUploadTask),
231-
("testDownloadTask", testDownloadTask)
232-
]
233217
}

Tests/LinuxMain.swift

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)