Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Remove conflicting nullable specifier on init #4182

Merged
merged 3 commits into from Mar 23, 2018

Conversation

SlaunchaMan
Copy link
Contributor

@SlaunchaMan SlaunchaMan commented Mar 16, 2018

See #4154—this is just cherry-picking it onto master. Closes #4163. Closes #4154.

The nullable specifier on init conflicts with the nonnull specifier on NSObject which generates a warning. This change removes it and throws an exception if init is used.
@codecov-io
Copy link

codecov-io commented Mar 16, 2018

Codecov Report

Merging #4182 into master will decrease coverage by 0.83%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4182      +/-   ##
==========================================
- Coverage   87.74%   86.91%   -0.84%     
==========================================
  Files          46       46              
  Lines        5730     6031     +301     
  Branches      294      332      +38     
==========================================
+ Hits         5028     5242     +214     
- Misses        702      789      +87
Impacted Files Coverage Δ
AFNetworking/AFNetworkReachabilityManager.h 100% <ø> (ø) ⬆️
AFNetworking/AFNetworkReachabilityManager.m 76.19% <100%> (+6.27%) ⬆️
Tests/Tests/AFNetworkReachabilityManagerTests.m 98.27% <100%> (+0.27%) ⬆️
AFNetworking/AFURLSessionManager.m 70.71% <0%> (-1.5%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b3f5f64...68214ee. Read the comment docs.

@Coeur
Copy link
Contributor

Coeur commented Mar 21, 2018

Thanks for looking at it, @SlaunchaMan, albeit I can't see what's the issue about simply merging either #4163 or #4154.

[edit: ah OK, it was because Travis CI builds were previously broken on Master, so all Pull Requests were failing the test as well]

@SlaunchaMan
Copy link
Contributor Author

Yep, just trying to get the build bot happy.

@SlaunchaMan SlaunchaMan merged commit 9e005d9 into master Mar 23, 2018
@SlaunchaMan SlaunchaMan deleted the init-nullable-specifier-fix branch March 23, 2018 19:26
@SlaunchaMan SlaunchaMan added this to the 3.2.1 milestone May 4, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
4 participants