From 7bed7ba4bd2b30c599a5ccbfb51fe399fb3e6c30 Mon Sep 17 00:00:00 2001 From: "jaafar.abusair" Date: Tue, 19 Dec 2017 22:11:23 +0200 Subject: [PATCH 1/2] check if RCTBridgeModule.h already imported, for react v15.5+ --- Core/ios/Core/AWSRNCognitoCredentials.h | 4 ++++ DynamoDB/ios/DynamoDB/AWSRNDynamoDBClient.h | 4 ++++ Lambda/ios/Lambda/AWSRNLambdaClient.h | 4 ++++ SNS/ios/SNS/AWSRNSNSClient.h | 4 ++++ .../ios/AWSTransferUtility/AWSRNS3TransferUtility.h | 4 ++++ UserPools/ios/Login.h | 6 +++++- 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Core/ios/Core/AWSRNCognitoCredentials.h b/Core/ios/Core/AWSRNCognitoCredentials.h index 966e395..84368d8 100644 --- a/Core/ios/Core/AWSRNCognitoCredentials.h +++ b/Core/ios/Core/AWSRNCognitoCredentials.h @@ -17,7 +17,11 @@ #import #import "RCTEventDispatcher.h" +#if __has_include() +#import +#else #import "RCTBridgeModule.h" +#endif #import "AWSRNHelper.h" @interface AWSRNCognitoCredentials : NSObject diff --git a/DynamoDB/ios/DynamoDB/AWSRNDynamoDBClient.h b/DynamoDB/ios/DynamoDB/AWSRNDynamoDBClient.h index a5e887b..d25295c 100644 --- a/DynamoDB/ios/DynamoDB/AWSRNDynamoDBClient.h +++ b/DynamoDB/ios/DynamoDB/AWSRNDynamoDBClient.h @@ -16,7 +16,11 @@ #import #import "RCTEventDispatcher.h" +#if __has_include() +#import +#else #import "RCTBridgeModule.h" +#endif @interface AWSRNDynamoDBClient : NSObject diff --git a/Lambda/ios/Lambda/AWSRNLambdaClient.h b/Lambda/ios/Lambda/AWSRNLambdaClient.h index fc0096e..32c29f7 100644 --- a/Lambda/ios/Lambda/AWSRNLambdaClient.h +++ b/Lambda/ios/Lambda/AWSRNLambdaClient.h @@ -16,7 +16,11 @@ #import #import "RCTEventDispatcher.h" +#if __has_include() +#import +#else #import "RCTBridgeModule.h" +#endif @interface AWSRNLambdaClient : NSObject diff --git a/SNS/ios/SNS/AWSRNSNSClient.h b/SNS/ios/SNS/AWSRNSNSClient.h index 43ab43a..33ed2bb 100644 --- a/SNS/ios/SNS/AWSRNSNSClient.h +++ b/SNS/ios/SNS/AWSRNSNSClient.h @@ -16,7 +16,11 @@ #import #import "RCTEventDispatcher.h" +#if __has_include() +#import +#else #import "RCTBridgeModule.h" +#endif @interface AWSRNSNSClient : NSObject diff --git a/TransferUtility/ios/AWSTransferUtility/AWSRNS3TransferUtility.h b/TransferUtility/ios/AWSTransferUtility/AWSRNS3TransferUtility.h index 172d3ca..ffa52cc 100644 --- a/TransferUtility/ios/AWSTransferUtility/AWSRNS3TransferUtility.h +++ b/TransferUtility/ios/AWSTransferUtility/AWSRNS3TransferUtility.h @@ -17,7 +17,11 @@ #import #import "RCTEventDispatcher.h" +#if __has_include() +#import +#else #import "RCTBridgeModule.h" +#endif #import "AWSRNHelper.h" @interface AWSRNS3TransferUtility : NSObject diff --git a/UserPools/ios/Login.h b/UserPools/ios/Login.h index 7955852..6469268 100644 --- a/UserPools/ios/Login.h +++ b/UserPools/ios/Login.h @@ -15,7 +15,11 @@ #import #import -#import "RCTBridgeModule.h" +#if __has_include() + #import +#else + #import "RCTBridgeModule.h" +#endif #import "RCTLog.h" @interface Login : NSObject From 2af9201f36274633e57619f0291454e83e79c1cb Mon Sep 17 00:00:00 2001 From: "jaafar.abusair" Date: Sat, 23 Dec 2017 12:55:09 +0200 Subject: [PATCH 2/2] Adding midding region to ios, eu-west-2 --- Core/ios/Core/AWSRNHelper.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Core/ios/Core/AWSRNHelper.m b/Core/ios/Core/AWSRNHelper.m index edf473a..9d54179 100644 --- a/Core/ios/Core/AWSRNHelper.m +++ b/Core/ios/Core/AWSRNHelper.m @@ -26,6 +26,8 @@ - (AWSRegionType)regionTypeFromString: (NSString*)region { regionType = AWSRegionUSWest2; } else if ([region isEqualToString:@"eu-west-1"]) { regionType = AWSRegionEUWest1; + } else if ([region isEqualToString:@"eu-west-2"]) { + regionType = AWSRegionEUWest2; } else if ([region isEqualToString:@"eu-central-1"]) { regionType = AWSRegionEUCentral1; } else if ([region isEqualToString:@"ap-southeast-1"]) {