From 36d78a6d05cd5f8a550c19861317803235b5ee61 Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 27 Sep 2016 16:28:05 +0200 Subject: [PATCH 1/3] use modules if available --- AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h | 6 +++++- AFOAuth2Manager/AFOAuth2Manager.h | 9 +++++++-- AFOAuth2Manager/AFOAuthCredential.h | 6 +++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h b/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h index 243c1a3f..c97b205f 100644 --- a/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h +++ b/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h @@ -20,7 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#if __has_feature(modules) + @import AFNetworking; +#else + #import +#endif @class AFOAuthCredential; diff --git a/AFOAuth2Manager/AFOAuth2Manager.h b/AFOAuth2Manager/AFOAuth2Manager.h index f6927dd7..1c8749fa 100644 --- a/AFOAuth2Manager/AFOAuth2Manager.h +++ b/AFOAuth2Manager/AFOAuth2Manager.h @@ -20,10 +20,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE -#import +#if __has_feature(modules) + @import Foundation; + @import AFNetworking; +#else + #import + #import +#endif #import "AFOAuthCredential.h" #import "AFHTTPRequestSerializer+OAuth2.h" -#import NS_ASSUME_NONNULL_BEGIN diff --git a/AFOAuth2Manager/AFOAuthCredential.h b/AFOAuth2Manager/AFOAuthCredential.h index be97d5f4..c3fd3f44 100644 --- a/AFOAuth2Manager/AFOAuthCredential.h +++ b/AFOAuth2Manager/AFOAuthCredential.h @@ -20,7 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#if __has_feature(modules) + @import Foundation; +#else + #import +#endif NS_ASSUME_NONNULL_BEGIN From fd95c4aea8b99b5a19ee2c28bfaa7aba94499ee3 Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 27 Sep 2016 16:29:35 +0200 Subject: [PATCH 2/3] oops --- AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h b/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h index c97b205f..60a68231 100644 --- a/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h +++ b/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h @@ -23,7 +23,7 @@ #if __has_feature(modules) @import AFNetworking; #else - #import + #import #endif @class AFOAuthCredential; From fa3b7cdbb893c556408963d139d30e1823740583 Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 27 Sep 2016 16:30:20 +0200 Subject: [PATCH 3/3] copy paste gone wrong --- AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h b/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h index 60a68231..286354c8 100644 --- a/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h +++ b/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h @@ -23,7 +23,7 @@ #if __has_feature(modules) @import AFNetworking; #else - #import + #import #endif @class AFOAuthCredential;