Skip to content

Commit

Permalink
Merge branch 'main' into bugfix/1697
Browse files Browse the repository at this point in the history
  • Loading branch information
harsh62 authored Oct 4, 2021
2 parents 58c8db6 + 011675b commit 203e594
Show file tree
Hide file tree
Showing 207 changed files with 7,785 additions and 896 deletions.
33 changes: 17 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,13 @@ commands:
configure_aws:
description: >-
Install aws cli and configure android aws release profile
Install aws cli and configure release profile
steps:
- run:
name: Install AWS cli
name: Install AWS CLI
command: |
HOMEBREW_NO_AUTO_UPDATE=1 brew install awscli
curl -O https://awscli.amazonaws.com/AWSCLIV2.pkg
sudo installer -pkg AWSCLIV2.pkg -target /
- run:
name: Configure AWS profiles
command: |
Expand Down Expand Up @@ -248,7 +249,7 @@ commands:
jobs:
build:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- checkout_with_cache
Expand All @@ -271,7 +272,7 @@ jobs:

build_test_host_apps:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- checkout_with_cache
Expand All @@ -288,7 +289,7 @@ jobs:

unit_test:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
parameters:
project:
default: "AWSiOSSDKv2.xcodeproj"
Expand Down Expand Up @@ -341,7 +342,7 @@ jobs:

integ_test:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
parameters:
project:
default: "AWSiOSSDKv2.xcodeproj"
Expand Down Expand Up @@ -392,7 +393,7 @@ jobs:

release_tag:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- checkout_with_cache
Expand Down Expand Up @@ -427,7 +428,7 @@ jobs:

release_carthage:
macos:
xcode: "12.3.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- checkout_with_cache
Expand All @@ -448,7 +449,7 @@ jobs:

release_cocoapods:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- checkout_with_cache
Expand All @@ -466,7 +467,7 @@ jobs:

release_docs:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- checkout_with_cache
Expand Down Expand Up @@ -496,7 +497,7 @@ jobs:
add_doc_tag:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- checkout_with_cache
Expand All @@ -510,7 +511,7 @@ jobs:
bump_ios_sampleapp_version:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- set_environment_variables
Expand All @@ -529,7 +530,7 @@ jobs:

release_xcframeworks:
macos:
xcode: "12.3.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- checkout_with_cache
Expand Down Expand Up @@ -573,7 +574,7 @@ jobs:
release_xcframeworks_combined:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
environment:
TERM: xterm-256color
steps:
Expand Down Expand Up @@ -617,7 +618,7 @@ jobs:
bump_sdk_version:
macos:
xcode: "12.1.0"
xcode: "13.0.0"
steps:
- skip_job_unless_required
- set_environment_variables
Expand Down
4 changes: 2 additions & 2 deletions AWSAPIGateway.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = 'AWSAPIGateway'
s.version = '2.26.0'
s.version = '2.26.1'
s.summary = 'Amazon Web Services SDK for iOS.'

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

s.source_files = 'AWSAPIGateway/*.{h,m}'
end
2 changes: 1 addition & 1 deletion AWSAPIGateway/AWSAPIGatewayClient.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

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

NSString *const AWSAPIGatewaySDKVersion = @"2.26.0";
NSString *const AWSAPIGatewaySDKVersion = @"2.26.1";

static int defaultChunkSize = 1024;

Expand Down
2 changes: 1 addition & 1 deletion AWSAPIGateway/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions AWSAppleSignIn.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'AWSAppleSignIn'
s.version = '2.26.0'
s.version = '2.26.1'
s.summary = 'Amazon Web Services SDK for iOS.'

s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
Expand All @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
s.dependency 'AWSAuthCore', '2.26.0'
s.dependency 'AWSAuthCore', '2.26.1'
s.source_files = 'AWSAuthSDK/Sources/AWSAppleSignIn/*.{h,m}'
s.public_header_files = 'AWSAuthSDK/Sources/AWSAppleSignIn/*.h'
end
Expand Down
12 changes: 6 additions & 6 deletions AWSAuth.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'AWSAuth'
s.version = '2.26.0'
s.version = '2.26.1'
s.summary = 'Amazon Web Services SDK for iOS.'

s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
Expand All @@ -14,23 +14,23 @@ Pod::Spec.new do |s|
s.requires_arc = true

s.subspec 'Core' do |authcore|
authcore.dependency 'AWSAuthCore', '2.26.0'
authcore.dependency 'AWSAuthCore', '2.26.1'
end

s.subspec 'FacebookSignIn' do |facebook|
facebook.dependency 'AWSFacebookSignIn', '2.26.0'
facebook.dependency 'AWSFacebookSignIn', '2.26.1'
end

s.subspec 'GoogleSignIn' do |google|
google.dependency 'AWSGoogleSignIn', '2.26.0'
google.dependency 'AWSGoogleSignIn', '2.26.1'
end

s.subspec 'UserPoolsSignIn' do |up|
up.dependency 'AWSUserPoolsSignIn', '2.26.0'
up.dependency 'AWSUserPoolsSignIn', '2.26.1'
end

s.subspec 'UI' do |ui|
ui.dependency 'AWSAuthUI', '2.26.0'
ui.dependency 'AWSAuthUI', '2.26.1'
end

end
4 changes: 2 additions & 2 deletions AWSAuthCore.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'AWSAuthCore'
s.version = '2.26.0'
s.version = '2.26.1'
s.summary = 'Amazon Web Services SDK for iOS.'

s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
Expand All @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
s.dependency 'AWSCore', '2.26.0'
s.dependency 'AWSCore', '2.26.1'
s.source_files = 'AWSAuthSDK/Sources/AWSAuthCore/*.{h,m}'
s.public_header_files = 'AWSAuthSDK/Sources/AWSAuthCore/*.h'
end
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthSDK/Sources/AWSAppleSignIn/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthSDK/Sources/AWSAuthCore/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthSDK/Sources/AWSAuthUI/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthSDK/Sources/AWSFacebookSignIn/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthSDK/Sources/AWSGoogleSignIn/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthSDK/Sources/AWSMobileClient/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthSDK/Sources/AWSMobileClientXCF/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthSDK/Sources/AWSUserPoolsSignIn/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
6 changes: 3 additions & 3 deletions AWSAuthUI.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'AWSAuthUI'
s.version = '2.26.0'
s.version = '2.26.1'
s.summary = 'Amazon Web Services SDK for iOS.'

s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
Expand All @@ -12,8 +12,8 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
s.dependency 'AWSCore', '2.26.0'
s.dependency 'AWSAuthCore', '2.26.0'
s.dependency 'AWSCore', '2.26.1'
s.dependency 'AWSAuthCore', '2.26.1'
s.source_files = 'AWSAuthSDK/Sources/AWSAuthUI/*.{h,m}', 'AWSAuthSDK/Sources/AWSAuthUI/**/*.{h,m}', 'AWSAuthSDK/Sources/AWSUserPoolsSignIn/UserPoolsUI/AWSFormTableCell.h', 'AWSAuthSDK/Sources/AWSUserPoolsSignIn/UserPoolsUI/AWSTableInputCell.h', 'AWSAuthSDK/Sources/AWSUserPoolsSignIn/UserPoolsUI/AWSFormTableDelegate.h', 'AWSAuthSDK/Sources/AWSUserPoolsSignIn/UserPoolsUI/AWSUserPoolsUIHelper.h'
s.public_header_files = 'AWSAuthSDK/Sources/AWSAuthUI/AWSAuthUI.h', 'AWSAuthSDK/Sources/AWSAuthUI/AWSAuthUIViewController.h', 'AWSAuthSDK/Sources/AWSAuthUI/AWSAuthUIConfiguration.h'
s.private_header_files = 'AWSAuthSDK/Sources/AWSUserPoolsSignIn/UserPoolsUI/AWSFormTableCell.h', 'AWSAuthSDK/Sources/AWSAuthUI/AWSSignInViewController.h', 'AWSAuthSDK/Sources/AWSUserPoolsSignIn/UserPoolsUI/AWSTableInputCell.h', 'AWSAuthSDK/Sources/AWSUserPoolsSignIn/UserPoolsUI/AWSFormTableDelegate.h'
Expand Down
4 changes: 2 additions & 2 deletions AWSAutoScaling.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'AWSAutoScaling'
s.version = '2.26.0'
s.version = '2.26.1'
s.summary = 'Amazon Web Services SDK for iOS.'

s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
Expand All @@ -12,6 +12,6 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
s.dependency 'AWSCore', '2.26.0'
s.dependency 'AWSCore', '2.26.1'
s.source_files = 'AWSAutoScaling/*.{h,m}'
end
2 changes: 1 addition & 1 deletion AWSAutoScaling/AWSAutoScalingService.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#import "AWSAutoScalingResources.h"

static NSString *const AWSInfoAutoScaling = @"AutoScaling";
NSString *const AWSAutoScalingSDKVersion = @"2.26.0";
NSString *const AWSAutoScalingSDKVersion = @"2.26.1";


@interface AWSAutoScalingResponseSerializer : AWSXMLResponseSerializer
Expand Down
2 changes: 1 addition & 1 deletion AWSAutoScaling/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions AWSChimeSDKIdentity.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'AWSChimeSDKIdentity'
s.version = '2.26.0'
s.version = '2.26.1'
s.summary = 'Amazon Web Services SDK for iOS.'

s.description = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
Expand All @@ -12,6 +12,6 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
s.dependency 'AWSCore', '2.26.0'
s.dependency 'AWSCore', '2.26.1'
s.source_files = 'AWSChimeSDKIdentity/*.{h,m}'
end
2 changes: 1 addition & 1 deletion AWSChimeSDKIdentity/AWSChimeSDKIdentityService.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#import "AWSChimeSDKIdentityResources.h"

static NSString *const AWSInfoChimeSDKIdentity = @"ChimeSDKIdentity";
NSString *const AWSChimeSDKIdentitySDKVersion = @"2.26.0";
NSString *const AWSChimeSDKIdentitySDKVersion = @"2.26.1";


@interface AWSChimeSDKIdentityResponseSerializer : AWSJSONResponseSerializer
Expand Down
2 changes: 1 addition & 1 deletion AWSChimeSDKIdentity/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<string>2.26.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Loading

0 comments on commit 203e594

Please sign in to comment.