Skip to content

Commit 91426a8

Browse files
author
AWS
committed
The AWS Mobile SDK for iOS 2.5.4.
1 parent 1a3a40f commit 91426a8

File tree

246 files changed

+10597
-1110
lines changed

Some content is hidden

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

246 files changed

+10597
-1110
lines changed

‎AWSAPIGateway.podspec

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

33
s.name = 'AWSAPIGateway'
4-
s.version = '2.5.3'
4+
s.version = '2.5.4'
55
s.summary = 'Amazon Web Services SDK for iOS.'
66

77
s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
s.source = { :git => 'https://github.com/aws/aws-sdk-ios.git',
1414
:tag => s.version}
1515
s.requires_arc = true
16-
s.dependency 'AWSCore', '2.5.3'
16+
s.dependency 'AWSCore', '2.5.4'
1717

1818
s.source_files = 'AWSAPIGateway/*.{h,m}'
1919
end

‎AWSAPIGateway/AWSAPIGatewayClient.m

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
static NSString *const AWSAPIGatewayAPIKeyHeader = @"x-api-key";
2525

26-
static NSString *const AWSAPIGatewaySDKVersion = @"2.5.3";
26+
static NSString *const AWSAPIGatewaySDKVersion = @"2.5.4";
2727

2828
static int defaultChunkSize = 1024;
2929

@@ -145,7 +145,7 @@ - (instancetype)init {
145145

146146
NSData *data = [oStream propertyForKey: NSStreamDataWrittenToMemoryStreamKey];
147147
if (!data) {
148-
AWSLogVerbose(@"No data written to memory!");
148+
AWSDDLogVerbose(@"No data written to memory!");
149149
} else {
150150
request.HTTPBody = data;
151151
}
@@ -156,7 +156,7 @@ - (instancetype)init {
156156
}
157157

158158
if (!request.HTTPBody && ![apiRequest.HTTPBody isKindOfClass:[NSInputStream class]]) {
159-
AWSLogError(@"Failed to set a request body. %@", error);
159+
AWSDDLogError(@"Failed to set a request body. %@", error);
160160
}
161161
}
162162
return nil;
@@ -200,7 +200,7 @@ - (instancetype)init {
200200
statusCode:HTTPStatusCode]];
201201
}
202202
};
203-
AWSLogVerbose(@"%@",request);
203+
AWSDDLogVerbose(@"%@",request);
204204
NSURLSessionDataTask *sessionTask = [self.session dataTaskWithRequest:request
205205
completionHandler:completionHandler];
206206
[sessionTask resume];
@@ -232,7 +232,7 @@ - (AWSTask *)invokeHTTPRequest:(NSString *)HTTPMethod
232232
options:0
233233
error:&error];
234234
if (!request.HTTPBody) {
235-
AWSLogError(@"Failed to serialize a request body. %@", error);
235+
AWSDDLogError(@"Failed to serialize a request body. %@", error);
236236
}
237237
}
238238

@@ -275,7 +275,7 @@ - (AWSTask *)invokeHTTPRequest:(NSString *)HTTPMethod
275275
if (!JSONObject) {
276276
NSString *bodyString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
277277
if ([bodyString length] > 0) {
278-
AWSLogError(@"The body is not in JSON format. Body: %@\nError: %@", bodyString, error);
278+
AWSDDLogError(@"The body is not in JSON format. Body: %@\nError: %@", bodyString, error);
279279
}
280280
[completionSource setError:error];
281281
return;
@@ -321,7 +321,7 @@ - (AWSTask *)invokeHTTPRequest:(NSString *)HTTPMethod
321321
fromJSONDictionary:JSONObject
322322
error:&responseSerializationError];
323323
if (!JSONObject) {
324-
AWSLogError(@"Failed to serialize the body JSON. %@", responseSerializationError);
324+
AWSDDLogError(@"Failed to serialize the body JSON. %@", responseSerializationError);
325325
}
326326
}
327327
if ([JSONObject isKindOfClass:[NSArray class]]) {
@@ -333,7 +333,7 @@ - (AWSTask *)invokeHTTPRequest:(NSString *)HTTPMethod
333333
error:&responseSerializationError];
334334
[models addObject:model];
335335
if (!JSONObject) {
336-
AWSLogError(@"Failed to serialize the body JSON. %@", responseSerializationError);
336+
AWSDDLogError(@"Failed to serialize the body JSON. %@", responseSerializationError);
337337
}
338338
}
339339
JSONObject = models;
@@ -423,7 +423,7 @@ - (NSString *)encodeQueryStringValue:(id)value {
423423
return mutableString;
424424
}
425425

426-
AWSLogError(@"value[%@] is invalid.", value);
426+
AWSDDLogError(@"value[%@] is invalid.", value);
427427
return [[value description] aws_stringWithURLEncoding];
428428
}
429429

‎AWSAPIGateway/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>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.5.3</string>
18+
<string>2.5.4</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎AWSAutoScaling.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AWSAutoScaling'
3-
s.version = '2.5.3'
3+
s.version = '2.5.4'
44
s.summary = 'Amazon Web Services SDK for iOS.'
55

66
s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
@@ -12,6 +12,6 @@ Pod::Spec.new do |s|
1212
s.source = { :git => 'https://github.com/aws/aws-sdk-ios.git',
1313
:tag => s.version}
1414
s.requires_arc = true
15-
s.dependency 'AWSCore', '2.5.3'
15+
s.dependency 'AWSCore', '2.5.4'
1616
s.source_files = 'AWSAutoScaling/*.{h,m}'
1717
end

‎AWSAutoScaling/AWSAutoScalingResources.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515

1616
#import "AWSAutoScalingResources.h"
17-
#import <AWSCore/AWSLogging.h>
17+
#import <AWSCore/AWSCocoaLumberjack.h>
1818

1919
@interface AWSAutoScalingResources ()
2020

@@ -48,7 +48,7 @@ - (instancetype)init {
4848
error:&error];
4949
if (_definitionDictionary == nil) {
5050
if (error) {
51-
AWSLogError(@"Failed to parse JSON service definition: %@",error);
51+
AWSDDLogError(@"Failed to parse JSON service definition: %@",error);
5252
}
5353
}
5454
}

‎AWSAutoScaling/AWSAutoScalingService.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#import "AWSAutoScalingResources.h"
2727

2828
static NSString *const AWSInfoAutoScaling = @"AutoScaling";
29-
static NSString *const AWSAutoScalingSDKVersion = @"2.5.3";
29+
static NSString *const AWSAutoScalingSDKVersion = @"2.5.4";
3030

3131

3232
@interface AWSAutoScalingResponseSerializer : AWSXMLResponseSerializer

‎AWSAutoScaling/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>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.5.3</string>
18+
<string>2.5.4</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎AWSCloudWatch.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AWSCloudWatch'
3-
s.version = '2.5.3'
3+
s.version = '2.5.4'
44
s.summary = 'Amazon Web Services SDK for iOS.'
55

66
s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
@@ -12,6 +12,6 @@ Pod::Spec.new do |s|
1212
s.source = { :git => 'https://github.com/aws/aws-sdk-ios.git',
1313
:tag => s.version}
1414
s.requires_arc = true
15-
s.dependency 'AWSCore', '2.5.3'
15+
s.dependency 'AWSCore', '2.5.4'
1616
s.source_files = 'AWSCloudWatch/*.{h,m}'
1717
end

‎AWSCloudWatch/AWSCloudWatchResources.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515

1616
#import "AWSCloudWatchResources.h"
17-
#import <AWSCore/AWSLogging.h>
17+
#import <AWSCore/AWSCocoaLumberjack.h>
1818

1919
@interface AWSCloudWatchResources ()
2020

@@ -48,7 +48,7 @@ - (instancetype)init {
4848
error:&error];
4949
if (_definitionDictionary == nil) {
5050
if (error) {
51-
AWSLogError(@"Failed to parse JSON service definition: %@",error);
51+
AWSDDLogError(@"Failed to parse JSON service definition: %@",error);
5252
}
5353
}
5454
}

‎AWSCloudWatch/AWSCloudWatchService.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#import "AWSCloudWatchResources.h"
2727

2828
static NSString *const AWSInfoCloudWatch = @"CloudWatch";
29-
static NSString *const AWSCloudWatchSDKVersion = @"2.5.3";
29+
static NSString *const AWSCloudWatchSDKVersion = @"2.5.4";
3030

3131

3232
@interface AWSCloudWatchResponseSerializer : AWSXMLResponseSerializer

‎AWSCloudWatch/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>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.5.3</string>
18+
<string>2.5.4</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎AWSCognito.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AWSCognito'
3-
s.version = '2.5.3'
3+
s.version = '2.5.4'
44
s.summary = 'Amazon Cognito SDK for iOS'
55

66
s.description = 'Amazon Cognito offers multi device data synchronization with offline access'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
:tag => s.version}
1414
s.requires_arc = true
1515
s.library = 'sqlite3'
16-
s.dependency 'AWSCore', '2.5.3'
16+
s.dependency 'AWSCore', '2.5.4'
1717
s.source_files = 'AWSCognito/*.{h,m}', 'AWSCognito/**/*.{h,m}'
1818
s.public_header_files = 'AWSCognito/*.h', 'AWSCognito/CognitoSync/*.h'
1919
s.private_header_files = 'AWSCognito/Fabric/*.h', 'AWSCognito/Internal/*.h'

‎AWSCognito/AWSCognitoDataset.m

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#import "AWSCognitoRecord_Internal.h"
2323
#import "AWSCognitoSQLiteManager.h"
2424
#import "AWSCognitoConflict_Internal.h"
25-
#import <AWSCore/AWSLogging.h>
25+
#import <AWSCore/AWSCocoaLumberjack.h>
2626
#import "AWSCognitoRecord.h"
2727
#import "AWSKSReachability.h"
2828

@@ -105,7 +105,7 @@ - (NSString *)stringForKey:(NSString *)aKey
105105
AWSCognitoRecord *record = [self getRecordById:aKey error:&error];
106106
if(error || (!record.data.string))
107107
{
108-
AWSLogDebug(@"Error: %@", error);
108+
AWSDDLogDebug(@"Error: %@", error);
109109
}
110110

111111
if (record != nil && ![record isDeleted]) {
@@ -128,38 +128,38 @@ - (void)setString:(NSString *)aString forKey:(NSString *)aKey
128128

129129
//do some limit checks
130130
if([self sizeForRecord:record] > AWSCognitoMaxDatasetSize){
131-
AWSLogDebug(@"Error: Record would exceed max dataset size");
131+
AWSDDLogDebug(@"Error: Record would exceed max dataset size");
132132
return;
133133
}
134134

135135
if([self sizeForString:aKey] > AWSCognitoMaxKeySize){
136-
AWSLogDebug(@"Error: Key size too large, max is %d bytes", AWSCognitoMaxKeySize);
136+
AWSDDLogDebug(@"Error: Key size too large, max is %d bytes", AWSCognitoMaxKeySize);
137137
return;
138138
}
139139

140140
if([self sizeForString:aKey] < AWSCognitoMinKeySize){
141-
AWSLogDebug(@"Error: Key size too small, min is %d byte", AWSCognitoMinKeySize);
141+
AWSDDLogDebug(@"Error: Key size too small, min is %d byte", AWSCognitoMinKeySize);
142142
return;
143143
}
144144

145145

146146
if([self sizeForString:aString] > AWSCognitoMaxDatasetSize){
147-
AWSLogDebug(@"Error: Value size too large, max is %d bytes", AWSCognitoMaxRecordValueSize);
147+
AWSDDLogDebug(@"Error: Value size too large, max is %d bytes", AWSCognitoMaxRecordValueSize);
148148
return;
149149
}
150150

151151
int numRecords = [[self.sqliteManager numRecords:self.name] intValue];
152152

153153
//if you have the max # of records and you aren't replacing an existing one
154154
if(numRecords == AWSCognitoMaxNumRecords && !([self recordForKey:aKey] == nil)){
155-
AWSLogDebug(@"Error: Too many records, max is %d", AWSCognitoMaxNumRecords);
155+
AWSDDLogDebug(@"Error: Too many records, max is %d", AWSCognitoMaxNumRecords);
156156
return;
157157
}
158158

159159
NSError *error = nil;
160160
if(![self putRecord:record error:&error])
161161
{
162-
AWSLogDebug(@"Error: %@", error);
162+
AWSDDLogDebug(@"Error: %@", error);
163163
}
164164
}
165165

@@ -190,7 +190,7 @@ - (AWSCognitoRecord *)recordForKey: (NSString *)aKey
190190
AWSCognitoRecord * result = [self getRecordById:aKey error:&error];
191191
if(!result)
192192
{
193-
AWSLogDebug(@"Error: %@", error);
193+
AWSDDLogDebug(@"Error: %@", error);
194194
}
195195
return result;
196196
}
@@ -265,7 +265,7 @@ - (void)removeObjectForKey:(NSString *)aKey
265265
NSError *error = nil;
266266
if(![self removeRecordById:aKey error:&error])
267267
{
268-
AWSLogDebug(@"Error: %@", error);
268+
AWSDDLogDebug(@"Error: %@", error);
269269
}
270270
}
271271

@@ -274,7 +274,7 @@ - (void)clear
274274
NSError *error = nil;
275275
if(![self.sqliteManager deleteDataset:self.name error:&error])
276276
{
277-
AWSLogDebug(@"Error: %@", error);
277+
AWSDDLogDebug(@"Error: %@", error);
278278
}
279279
else {
280280
self.lastSyncCount = [NSNumber numberWithInt:-1];
@@ -349,7 +349,7 @@ - (AWSTask *)syncPull:(uint32_t)remainingAttempts {
349349
[self postDidFailToSynchronizeNotification:error];
350350
return [AWSTask taskWithError:error];
351351
}else if(task.error){
352-
AWSLogError(@"Unable to list records: %@", task.error);
352+
AWSDDLogError(@"Unable to list records: %@", task.error);
353353
//decrement sync counts that exceed the service sync count and try again
354354
if(task.error.code == AWSCognitoSyncErrorInvalidParameter && self.currentSyncCount.longLongValue > 0
355355
&& task.error.userInfo[@"NSLocalizedDescription"] && [task.error.userInfo[@"NSLocalizedDescription"] hasPrefix:@"No such SyncCount:"]){
@@ -430,7 +430,7 @@ - (AWSTask *)syncPull:(uint32_t)remainingAttempts {
430430
}
431431
else{
432432
//conflict resolution
433-
AWSLogInfo(@"Record %@ is dirty with value: %@ and can't be overwritten, flagging for conflict resolution",existing.recordId,existing.data.string);
433+
AWSDDLogInfo(@"Record %@ is dirty with value: %@ and can't be overwritten, flagging for conflict resolution",existing.recordId,existing.data.string);
434434
[conflicts addObject: [[AWSCognitoConflict alloc] initWithLocalRecord:existing remoteRecord:newRecord]];
435435
}
436436
}
@@ -535,7 +535,7 @@ - (AWSTask *)syncPush:(uint32_t)remainingAttempts {
535535
return [AWSTask taskWithError:error];
536536
}else if(task.error){
537537
if(task.error.code == AWSCognitoSyncErrorResourceConflict){
538-
AWSLogInfo("Conflicts existed on update, restarting synchronize.");
538+
AWSDDLogInfo(@"Conflicts existed on update, restarting synchronize.");
539539
if(currentSyncCount > maxPatchSyncCount) {
540540
//it's possible there is a local dirty record with a stale sync count
541541
//this will fix it
@@ -544,7 +544,7 @@ - (AWSTask *)syncPush:(uint32_t)remainingAttempts {
544544
return [self synchronizeInternal:remainingAttempts-1];
545545
}
546546
else {
547-
AWSLogError(@"An error occured attempting to update records: %@",task.error);
547+
AWSDDLogError(@"An error occured attempting to update records: %@",task.error);
548548
}
549549
return task;
550550
}else{
@@ -671,7 +671,7 @@ - (AWSTask *)synchronize {
671671

672672
- (AWSTask *)synchronizeInternal:(uint32_t)remainingAttempts {
673673
if(remainingAttempts == 0){
674-
AWSLogError(@"Conflict retries exhausted");
674+
AWSDDLogError(@"Conflict retries exhausted");
675675
NSError *error = [NSError errorWithDomain:AWSCognitoErrorDomain code:AWSCognitoErrorConflictRetriesExhausted userInfo:nil];
676676
[self postDidFailToSynchronizeNotification:error];
677677
return [AWSTask taskWithError:error];
@@ -692,7 +692,7 @@ - (AWSTask *)synchronizeInternal:(uint32_t)remainingAttempts {
692692
[self postDidFailToSynchronizeNotification:error];
693693
return [AWSTask taskWithError:error];
694694
} else if(task.error && task.error.code != AWSCognitoSyncErrorResourceNotFound){
695-
AWSLogError(@"Unable to delete dataset: %@", task.error);
695+
AWSDDLogError(@"Unable to delete dataset: %@", task.error);
696696
return task;
697697
} else {
698698
[self.sqliteManager deleteMetadata:self.name error:nil];
@@ -742,7 +742,7 @@ -(AWSTask *)subscribe {
742742
if(task.isCancelled){
743743
return [AWSTask taskWithError:[NSError errorWithDomain:AWSCognitoErrorDomain code:AWSCognitoErrorTaskCanceled userInfo:nil]];
744744
}else if(task.error){
745-
AWSLogError(@"Unable to subscribe dataset: %@", task.error);
745+
AWSDDLogError(@"Unable to subscribe dataset: %@", task.error);
746746
return task;
747747
}else {
748748
return [AWSTask taskWithResult:task.result];
@@ -766,7 +766,7 @@ -(AWSTask *)unsubscribe {
766766
if(task.isCancelled){
767767
return [AWSTask taskWithError:[NSError errorWithDomain:AWSCognitoErrorDomain code:AWSCognitoErrorTaskCanceled userInfo:nil]];
768768
}else if(task.error){
769-
AWSLogError(@"Unable to unsubscribe dataset: %@", task.error);
769+
AWSDDLogError(@"Unable to unsubscribe dataset: %@", task.error);
770770
return task;
771771
}else {
772772
return [AWSTask taskWithResult:task.result];
@@ -777,7 +777,7 @@ -(AWSTask *)unsubscribe {
777777
#pragma mark IdentityMerge
778778

779779
- (void)identityChanged:(NSNotification *)notification {
780-
AWSLogDebug(@"IdentityChanged");
780+
AWSDDLogDebug(@"IdentityChanged");
781781

782782
// by the point we are called, all datasets will have been reparented
783783
[self checkForLocalMergedDatasets];

0 commit comments

Comments
 (0)