Skip to content

Commit f41c535

Browse files
committed
II-15-[bump pods]
1 parent 6978c41 commit f41c535

File tree

15 files changed

+103
-70
lines changed

15 files changed

+103
-70
lines changed

.swiftlint.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
swiftlint_version: 0.43.1
1+
swiftlint_version: 0.57.1
22

33
excluded: # paths to ignore during linting. Takes precedence over `included`.
44
- Pods
@@ -64,7 +64,6 @@ opt_in_rules:
6464
- force_unwrapping
6565
- identical_operands
6666
# - indentation_width # disabled, because multiline arguments are not recognized properly
67-
- inert_defer
6867
- last_where
6968
- legacy_random
7069
- let_var_whitespace

HTTPClient_Example.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@
379379
SDKROOT = iphoneos;
380380
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
381381
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
382+
SWIFT_STRICT_CONCURRENCY = complete;
382383
};
383384
name = Debug;
384385
};
@@ -433,6 +434,7 @@
433434
SDKROOT = iphoneos;
434435
SWIFT_COMPILATION_MODE = wholemodule;
435436
SWIFT_OPTIMIZATION_LEVEL = "-O";
437+
SWIFT_STRICT_CONCURRENCY = complete;
436438
VALIDATE_PRODUCT = YES;
437439
};
438440
name = Release;
@@ -446,7 +448,7 @@
446448
CODE_SIGN_STYLE = Automatic;
447449
DEVELOPMENT_TEAM = MW2UF479VW;
448450
INFOPLIST_FILE = "$(SRCROOT)/HTTPClient_Example/Resources/Info.plist";
449-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
451+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
450452
LD_RUNPATH_SEARCH_PATHS = (
451453
"$(inherited)",
452454
"@executable_path/Frameworks",
@@ -467,7 +469,7 @@
467469
CODE_SIGN_STYLE = Automatic;
468470
DEVELOPMENT_TEAM = MW2UF479VW;
469471
INFOPLIST_FILE = "$(SRCROOT)/HTTPClient_Example/Resources/Info.plist";
470-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
472+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
471473
LD_RUNPATH_SEARCH_PATHS = (
472474
"$(inherited)",
473475
"@executable_path/Frameworks",

HTTPClient_Example/HTTPClient/ExampleHTTPClient.swift

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ import Alamofire
66
import Foundation
77
import HTTPClient_Framework
88

9-
internal class ExampleHTTPClient: HTTPClient {
9+
internal final class ExampleHTTPClient: HTTPClientProtocol {
1010

11-
internal init() {
12-
super.init(name: "ExampleHTTPClient", logger: ExampleHTTPLogger())
13-
}
11+
internal let httpClient: HTTPClient
1412

15-
internal override func commonHeaders() -> [HTTPHeader] {
16-
return []
13+
internal init() {
14+
self.httpClient = HTTPClient(name: "ExampleHTTPClient",
15+
configuration: nil,
16+
logger: ExampleHTTPLogger(),
17+
commonHeaders: [])
1718
}
1819

1920
}

HTTPClient_Example/UI/ExampleViewController.swift

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private extension ExampleViewController {
5151
urlQueryParameters: nil,
5252
bodyParameters: nil)
5353
request = client.sendRequest(options: requestOptions, completion: { [weak self] (result) in
54-
DispatchQueue.main.async(execute: {
54+
Task(operation: { @MainActor [weak self] in
5555
guard let strongSelf = self else {
5656
return
5757
}
@@ -78,22 +78,20 @@ private extension ExampleViewController {
7878
parser: ExampleParser(),
7979
urlQueryParameters: nil,
8080
bodyParameters: nil)
81-
Task { @MainActor [weak self] in
82-
let result = await self?.client.sendRequest(options: requestOptions)
83-
guard let strongResult = result, let strongSelf = self else {
84-
return
85-
}
86-
strongSelf.activityIndicator.stopAnimating()
87-
switch strongResult {
81+
let httpClient = client
82+
Task(operation: { @MainActor [weak self] in
83+
let result = await httpClient.sendRequest(options: requestOptions)
84+
self?.activityIndicator.stopAnimating()
85+
switch result {
8886
case .success(let contributors):
89-
strongSelf.contributors = contributors
90-
strongSelf.tableView.reloadData()
87+
self?.contributors = contributors
88+
self?.tableView.reloadData()
9189
case .cancelled:
9290
break
9391
case .failure(let error):
9492
print(error)
9593
}
96-
}
94+
})
9795
}
9896

9997
}

HTTPClient_Framework.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@
298298
SDKROOT = iphoneos;
299299
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
300300
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
301+
SWIFT_STRICT_CONCURRENCY = complete;
301302
VERSIONING_SYSTEM = "apple-generic";
302303
VERSION_INFO_PREFIX = "";
303304
};
@@ -355,6 +356,7 @@
355356
SDKROOT = iphoneos;
356357
SWIFT_COMPILATION_MODE = wholemodule;
357358
SWIFT_OPTIMIZATION_LEVEL = "-O";
359+
SWIFT_STRICT_CONCURRENCY = complete;
358360
VALIDATE_PRODUCT = YES;
359361
VERSIONING_SYSTEM = "apple-generic";
360362
VERSION_INFO_PREFIX = "";
@@ -373,7 +375,7 @@
373375
DYLIB_INSTALL_NAME_BASE = "@rpath";
374376
INFOPLIST_FILE = HTTPClient_Framework/Info.plist;
375377
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
376-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
378+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
377379
LD_RUNPATH_SEARCH_PATHS = (
378380
"$(inherited)",
379381
"@executable_path/Frameworks",
@@ -399,7 +401,7 @@
399401
DYLIB_INSTALL_NAME_BASE = "@rpath";
400402
INFOPLIST_FILE = HTTPClient_Framework/Info.plist;
401403
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
402-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
404+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
403405
LD_RUNPATH_SEARCH_PATHS = (
404406
"$(inherited)",
405407
"@executable_path/Frameworks",

HTTPClient_Framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>1.2.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
</dict>

Podfile

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

3-
platform :ios, '13.0'
3+
platform :ios, '15.0'
44

55
use_frameworks!
66

77
workspace 'HTTPClient'
88

99
target 'HTTPClient_Framework' do
1010
project 'HTTPClient_Framework.xcodeproj'
11-
pod 'Shakuro.CommonTypes', '1.1.6'
12-
pod 'Alamofire', '5.9.1'
11+
pod 'Shakuro.CommonTypes', '1.9.5'
12+
pod 'Alamofire', '5.10.2'
1313
end
1414

1515
target 'HTTPClient_Example' do
1616
project 'HTTPClient_Example.xcodeproj'
17-
pod 'SwiftLint', '0.43.1'
18-
pod 'Shakuro.CommonTypes', '1.1.6'
19-
pod 'Alamofire', '5.9.1'
17+
pod 'SwiftLint', '0.57.1'
18+
pod 'Shakuro.CommonTypes', '1.9.5'
19+
pod 'Alamofire', '5.10.2'
20+
end
21+
22+
post_install do |installer|
23+
24+
installer.pods_project.targets.each do |target|
25+
target.build_configurations.each do |config|
26+
config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
27+
end
28+
end
29+
2030
end

Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
PODS:
2-
- Alamofire (5.9.1)
3-
- Shakuro.CommonTypes (1.1.5)
4-
- SwiftLint (0.43.1)
2+
- Alamofire (5.10.2)
3+
- Shakuro.CommonTypes (1.9.5)
4+
- SwiftLint (0.57.1)
55

66
DEPENDENCIES:
7-
- Alamofire (= 5.9.1)
8-
- Shakuro.CommonTypes (= 1.1.5)
9-
- SwiftLint (= 0.43.1)
7+
- Alamofire (= 5.10.2)
8+
- Shakuro.CommonTypes (= 1.9.5)
9+
- SwiftLint (= 0.57.1)
1010

1111
SPEC REPOS:
1212
https://github.com/CocoaPods/Specs.git:
@@ -15,10 +15,10 @@ SPEC REPOS:
1515
- SwiftLint
1616

1717
SPEC CHECKSUMS:
18-
Alamofire: f36a35757af4587d8e4f4bfa223ad10be2422b8c
19-
Shakuro.CommonTypes: 96dacfa3bd4688d1313dcfe78fa4df56d0a936b0
20-
SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
18+
Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
19+
Shakuro.CommonTypes: 68e5a32e3f2ec4c6c4513aa2a211427b5472b785
20+
SwiftLint: 92196976e597b9afec5dbe374810103e6c1d9d7c
2121

22-
PODFILE CHECKSUM: 451cab521db43d46b19d505f16b9c512b8c2a741
22+
PODFILE CHECKSUM: b5bdd6efa2f4203d759a6e1131a2b00b74649b7b
2323

24-
COCOAPODS: 1.15.2
24+
COCOAPODS: 1.16.2

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![Shakuro HTTPClient](Resources/title_image.png)
22
<br><br>
33
# HTTPClient
4-
![Version](https://img.shields.io/badge/version-1.1.4-blue.svg)
4+
![Version](https://img.shields.io/badge/version-1.2.0-blue.svg)
55
![Platform](https://img.shields.io/badge/platform-iOS-lightgrey.svg)
66
![License MIT](https://img.shields.io/badge/license-MIT-green.svg)
77

@@ -16,8 +16,8 @@ HTTPClient is a Swift library designed to abstract away access to Alamofire. The
1616

1717
## Requirements
1818

19-
- iOS 13.0+
20-
- Xcode 15.0+
19+
- iOS 15.0+
20+
- Xcode 16.0+
2121
- Swift 5.0+
2222

2323
## Installation

Shakuro.HTTPClient.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
Pod::Spec.new do |s|
22

33
s.name = 'Shakuro.HTTPClient'
4-
s.version = '1.1.6'
4+
s.version = '1.2.0'
55
s.summary = 'HTTP client for iOS'
66
s.homepage = 'https://github.com/shakurocom/HTTPClient'
77
s.license = { :type => "MIT", :file => "LICENSE.md" }
88
s.authors = {'apopov1988' => 'apopov@shakuro.com', 'wwwpix' => 'spopov@shakuro.com'}
99
s.source = { :git => 'https://github.com/shakurocom/HTTPClient.git', :tag => s.version }
10-
s.swift_versions = ['5.1', '5.2', '5.3', '5.4', '5.5', '5.6']
10+
s.swift_versions = ['5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.9']
1111
s.source_files = 'Source/*'
12-
s.ios.deployment_target = '13.0'
12+
s.ios.deployment_target = '15.0'
1313

1414
s.framework = "Foundation"
15-
s.dependency "Alamofire", "~> 5.9.1"
16-
s.dependency "Shakuro.CommonTypes", "~> 1.1"
15+
s.dependency "Alamofire", "~> 5.10.2"
16+
s.dependency "Shakuro.CommonTypes", "~> 1.9.5"
1717

1818
end

0 commit comments

Comments
 (0)