Skip to content

Commit f43f2fb

Browse files
authored
Merge pull request #3 from lamprosg/master
Official AFNetworking Upstream merge.
2 parents cba6b46 + 8d0d023 commit f43f2fb

File tree

101 files changed

+1740
-1460
lines changed

Some content is hidden

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

101 files changed

+1740
-1460
lines changed

.codecov.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ignore:
2+
- "Tests"

.github/issue_template.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
> ℹ Please fill out this template when filing an issue.
2+
> All lines beginning with an ℹ symbol instruct you with what info we expect. You can delete those lines once you've filled in the info.
3+
>
4+
> Per our [*CONTRIBUTING guidelines](https://github.com/AFNetworking/AFNetworking/blob/master/CONTRIBUTING.md), we use GitHub for
5+
> bugs and feature requests, not general support. Other issues should be opened on Stack Overflow with the tag `afnetworking`.
6+
>
7+
> Please remove this line and everything above it before submitting.
8+
9+
* [ ] I've read, understood, and done my best to follow the [*CONTRIBUTING guidelines](https://github.com/AFNetworking/AFNetworking/blob/master/CONTRIBUTING.md).
10+
11+
## What did you do?
12+
13+
ℹ Please replace this with what you did.
14+
15+
## What did you expect to happen?
16+
17+
ℹ Please replace this with what you expected to happen.
18+
19+
## What happened instead?
20+
21+
ℹ Please replace this with of what happened instead.
22+
23+
## AFNetworking Environment
24+
25+
**AFNetworking version:**
26+
**Xcode version:**
27+
**Swift version:**
28+
**Platform(s) running AFNetworking:**
29+
**macOS version running Xcode:**
30+
31+
## Demo Project
32+
33+
ℹ Please link to or upload a project we can download that reproduces the issue.

.github/pull_request_template.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
### Issue Link :link:
2+
<!-- What issue does this fix? If an issue doesn't exist, remove this section. -->
3+
4+
### Goals :soccer:
5+
<!-- List the high-level objectives of this pull request. -->
6+
<!-- Include any relevant context. -->
7+
8+
### Implementation Details :construction:
9+
<!-- Explain the reasoning behind any architectural changes. -->
10+
<!-- Highlight any new functionality. -->
11+
12+
### Testing Details :mag:
13+
<!-- Describe what tests you've added for your changes. -->

.github/stale.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Configuration for probot-stale - https://github.com/probot/stale
2+
3+
# Number of days of inactivity before an Issue or Pull Request becomes stale
4+
daysUntilStale: 14
5+
6+
# Number of days of inactivity before a stale Issue or Pull Request is closed
7+
daysUntilClose: 7
8+
9+
# Issues or Pull Requests with these labels will never be considered stale
10+
exemptLabels:
11+
- "support"
12+
- "bug"
13+
- "security"
14+
- "needs investigation"
15+
16+
# Label to use when marking as stale
17+
staleLabel: stale
18+
19+
# Comment to post when marking as stale. Set to `false` to disable
20+
markComment: >
21+
This issue has been marked as stale because it has not had
22+
recent activity. It will be closed if no further activity occurs.
23+
24+
# Comment to post when removing the stale label. Set to `false` to disable
25+
unmarkComment: false
26+
27+
# Comment to post when closing a stale Issue or Pull Request. Set to `false` to disable
28+
closeComment: >
29+
This issue has been auto-closed because there hasn't been any activity for at least 21 days.
30+
However, we really appreciate your contribution, so thank you for that! 🙏
31+
Also, feel free to [open a new issue](https://github.com/AFNetworking/AFNetworking/issues/new) if you still experience this problem 👍.
32+
33+
# Limit to only `issues`
34+
only: issues

.github/workflows/ci.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "AFNetworking CI"
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- '*'
10+
11+
jobs:
12+
macOS:
13+
name: Test macOS
14+
runs-on: macOS-latest
15+
env:
16+
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: macOS
20+
run: fastlane ci_commit configuration:Debug --env macos
21+
iOS:
22+
name: Test iOS
23+
runs-on: macOS-latest
24+
env:
25+
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
26+
steps:
27+
- uses: actions/checkout@v2
28+
- name: iOS
29+
run: fastlane ci_commit configuration:Debug --env ios13_xcode11
30+
Catalyst:
31+
name: Test Catalyst
32+
runs-on: macOS-latest
33+
env:
34+
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
35+
steps:
36+
- uses: actions/checkout@v2
37+
- name: Catalyst
38+
run: fastlane ci_commit configuration:Debug --env catalyst
39+
tvOS:
40+
name: Test tvOS
41+
runs-on: macOS-latest
42+
env:
43+
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
44+
steps:
45+
- uses: actions/checkout@v2
46+
- name: tvOS
47+
run: fastlane ci_commit configuration:Debug --env tvos13_xcode11
48+
watchOS:
49+
name: Build watchOS
50+
runs-on: macOS-latest
51+
env:
52+
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
53+
strategy:
54+
matrix:
55+
destination: ["OS=6.1.1,name=Apple Watch Series 5 - 44mm"] #, "OS=4.2,name=Apple Watch Series 3 - 42mm", "OS=3.2,name=Apple Watch Series 2 - 42mm"]
56+
steps:
57+
- uses: actions/checkout@v2
58+
- name: watchOS - ${{ matrix.destination }}
59+
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "AFNetworking.xcodeproj" -scheme "AFNetworking watchOS" -destination "${{ matrix.destination }}" clean build | xcpretty
60+
SPM:
61+
name: Build with SPM
62+
runs-on: macOS-latest
63+
env:
64+
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
65+
steps:
66+
- uses: actions/checkout@v2
67+
- name: SPM Build
68+
run: swift build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ fastlane/test-output/*
2929
Carthage/Build
3030

3131
fastlane/README.md
32+
.build

.ruby-gemset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
afnetworking

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.2.0

.travis.yml

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

AFNetworking.podspec

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,36 @@
11
Pod::Spec.new do |s|
22
s.name = 'AFNetworking'
3-
s.version = '3.2.2'
3+
s.version = '4.0.1'
44
s.license = 'MIT'
5-
s.summary = 'A delightful iOS and OS X networking framework.'
5+
s.summary = 'A delightful networking framework for Apple platforms.'
66
s.homepage = 'https://github.com/AFNetworking/AFNetworking'
77
s.social_media_url = 'https://twitter.com/AFNetworking'
88
s.authors = { 'Mattt Thompson' => 'm@mattt.me' }
9-
s.source = { :git => 'https://github.com/AFNetworking/AFNetworking.git', :tag => s.version, :submodules => true }
9+
s.source = { :git => 'https://github.com/AFNetworking/AFNetworking.git', :tag => s.version }
1010
s.requires_arc = true
1111

1212
s.public_header_files = 'AFNetworking/AFNetworking.h'
1313
s.source_files = 'AFNetworking/AFNetworking.h'
1414
s.resource_bundles = {'AFNetworking' => ['AFNetworking/PrivacyInfo.xcprivacy']}
15-
16-
pch_AF = <<-EOS
17-
#ifndef TARGET_OS_IOS
18-
#define TARGET_OS_IOS TARGET_OS_IPHONE
19-
#endif
20-
21-
#ifndef TARGET_OS_WATCH
22-
#define TARGET_OS_WATCH 0
23-
#endif
2415

25-
#ifndef TARGET_OS_TV
26-
#define TARGET_OS_TV 0
27-
#endif
28-
EOS
29-
s.prefix_header_contents = pch_AF
30-
3116
s.ios.deployment_target = '12.0'
3217
s.osx.deployment_target = '10.13'
3318
s.watchos.deployment_target = '4.0'
3419
s.tvos.deployment_target = '12.0'
35-
20+
21+
s.ios.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER' => 'com.alamofire.AFNetworking' }
22+
s.osx.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER' => 'com.alamofire.AFNetworking' }
23+
s.watchos.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER' => 'com.alamofire.AFNetworking-watchOS' }
24+
s.tvos.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER' => 'com.alamofire.AFNetworking' }
25+
26+
s.source_files = 'AFNetworking/AFNetworking.h'
27+
3628
s.subspec 'Serialization' do |ss|
3729
ss.source_files = 'AFNetworking/AFURL{Request,Response}Serialization.{h,m}'
38-
ss.public_header_files = 'AFNetworking/AFURL{Request,Response}Serialization.h'
39-
ss.watchos.frameworks = 'MobileCoreServices', 'CoreGraphics'
40-
ss.ios.frameworks = 'MobileCoreServices', 'CoreGraphics'
41-
ss.osx.frameworks = 'CoreServices'
4230
end
4331

4432
s.subspec 'Security' do |ss|
4533
ss.source_files = 'AFNetworking/AFSecurityPolicy.{h,m}'
46-
ss.public_header_files = 'AFNetworking/AFSecurityPolicy.h'
47-
ss.frameworks = 'Security'
4834
end
4935

5036
s.subspec 'Reachability' do |ss|
@@ -53,9 +39,6 @@ EOS
5339
ss.tvos.deployment_target = '12.0'
5440

5541
ss.source_files = 'AFNetworking/AFNetworkReachabilityManager.{h,m}'
56-
ss.public_header_files = 'AFNetworking/AFNetworkReachabilityManager.h'
57-
58-
ss.frameworks = 'SystemConfiguration'
5942
end
6043

6144
s.subspec 'NSURLSession' do |ss|
@@ -66,15 +49,13 @@ EOS
6649
ss.dependency 'AFNetworking/Security'
6750

6851
ss.source_files = 'AFNetworking/AF{URL,HTTP}SessionManager.{h,m}', 'AFNetworking/AFCompatibilityMacros.h'
69-
ss.public_header_files = 'AFNetworking/AF{URL,HTTP}SessionManager.h', 'AFNetworking/AFCompatibilityMacros.h'
7052
end
7153

7254
s.subspec 'UIKit' do |ss|
7355
ss.ios.deployment_target = '12.0'
7456
ss.tvos.deployment_target = '12.0'
7557
ss.dependency 'AFNetworking/NSURLSession'
7658

77-
ss.public_header_files = 'UIKit+AFNetworking/*.h'
7859
ss.source_files = 'UIKit+AFNetworking'
7960
end
8061
end

0 commit comments

Comments
 (0)