Skip to content

Commit 6979763

Browse files
palpatimpalpatim
authored
feat: Support Xcode 12 (#779)
- chore: improve output of private repo script - chore: Use Xcode 12.0.0 image to build in CircleCI - chore: Bump SDK dependency version to 2.17.0
1 parent 3637f31 commit 6979763

File tree

15 files changed

+265
-221
lines changed

15 files changed

+265
-221
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 2.1
44

55
defaults: &defaults
66
macos:
7-
xcode: '11.4.1'
7+
xcode: '12.0.0'
88
working_directory: ~/amplify-ios
99
environment:
1010
BUNDLE_PATH: vendor/bundle

‎AWSPluginsCore.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
$AMPLIFY_VERSION = '1.2.0'
1111
$AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
1212

13-
$AWS_SDK_VERSION = '2.15.0'
13+
$AWS_SDK_VERSION = '2.17.0'
1414
$OPTIMISTIC_AWS_SDK_VERSION = "~> #{$AWS_SDK_VERSION}"
1515

1616
Pod::Spec.new do |s|

‎AWSPredictionsPlugin.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
$AMPLIFY_VERSION = '1.2.0'
33
$AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
44

5-
$AWS_SDK_VERSION = '2.15.0'
5+
$AWS_SDK_VERSION = '2.17.0'
66
$OPTIMISTIC_AWS_SDK_VERSION = "~> #{$AWS_SDK_VERSION}"
77

88
Pod::Spec.new do |s|

‎AmplifyPlugins.podspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
$AMPLIFY_VERSION = '1.2.0'
1111
$AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
1212

13-
$AWS_SDK_VERSION = '2.15.0'
13+
$AWS_SDK_VERSION = '2.17.0'
1414
$OPTIMISTIC_AWS_SDK_VERSION = "~> #{$AWS_SDK_VERSION}"
1515

1616
Pod::Spec.new do |s|
@@ -46,8 +46,9 @@ Pod::Spec.new do |s|
4646

4747
# This is technically redundant, but adding it here allows Xcode to find it
4848
# during initial indexing and prevent build errors after a fresh install
49-
s.dependency 'AWSAuthCore', $OPTIMISTIC_AWS_SDK_VERSION
50-
49+
ss.dependency 'AWSAuthCore', $OPTIMISTIC_AWS_SDK_VERSION
50+
ss.dependency 'AWSCognitoIdentityProvider', $OPTIMISTIC_AWS_SDK_VERSION
51+
ss.dependency 'AWSCognitoIdentityProviderASF', $OPTIMISTIC_AWS_SDK_VERSION
5152
end
5253

5354
s.subspec 'AWSDataStorePlugin' do |ss|

‎AmplifyPlugins/API/Podfile.lock‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,51 @@ PODS:
33
- Amplify/Default (= 1.2.0)
44
- Amplify/Default (1.2.0)
55
- AmplifyPlugins/AWSCognitoAuthPlugin (1.2.0):
6-
- AWSAuthCore (~> 2.15.0)
7-
- AWSCore (~> 2.15.0)
8-
- AWSMobileClient (~> 2.15.0)
6+
- AWSAuthCore (~> 2.17.0)
7+
- AWSCognitoIdentityProvider (~> 2.17.0)
8+
- AWSCognitoIdentityProviderASF (~> 2.17.0)
9+
- AWSCore (~> 2.17.0)
10+
- AWSMobileClient (~> 2.17.0)
911
- AWSPluginsCore (= 1.2.0)
1012
- AmplifyTestCommon (1.2.0):
1113
- Amplify (= 1.2.0)
1214
- AmplifyTestCommon/AWSPluginsTestCommon (= 1.2.0)
1315
- AmplifyTestCommon/AWSPluginsTestCommon (1.2.0):
1416
- Amplify (= 1.2.0)
15-
- AWSCore (~> 2.15.0)
17+
- AWSCore (~> 2.17.0)
1618
- AWSPluginsCore (= 1.2.0)
1719
- AppSyncRealTimeClient (1.4.1):
1820
- Starscream (~> 3.1.0)
19-
- AWSAuthCore (2.15.3):
20-
- AWSCore (= 2.15.3)
21-
- AWSCognitoIdentityProvider (2.15.3):
22-
- AWSCognitoIdentityProviderASF (= 1.0.2)
23-
- AWSCore (= 2.15.3)
24-
- AWSCognitoIdentityProviderASF (1.0.2)
25-
- AWSCore (2.15.3)
26-
- AWSMobileClient (2.15.3):
27-
- AWSAuthCore (= 2.15.3)
28-
- AWSCognitoIdentityProvider (= 2.15.3)
21+
- AWSAuthCore (2.17.0):
22+
- AWSCore (= 2.17.0)
23+
- AWSCognitoIdentityProvider (2.17.0):
24+
- AWSCognitoIdentityProviderASF (= 2.17.0)
25+
- AWSCore (= 2.17.0)
26+
- AWSCognitoIdentityProviderASF (2.17.0)
27+
- AWSCore (2.17.0)
28+
- AWSMobileClient (2.17.0):
29+
- AWSAuthCore (= 2.17.0)
30+
- AWSCognitoIdentityProvider (= 2.17.0)
31+
- AWSCognitoIdentityProviderASF (= 2.17.0)
32+
- AWSCore (= 2.17.0)
2933
- AWSPluginsCore (1.2.0):
3034
- Amplify (= 1.2.0)
31-
- AWSCore (~> 2.15.0)
32-
- AWSMobileClient (~> 2.15.0)
35+
- AWSCore (~> 2.17.0)
36+
- AWSMobileClient (~> 2.17.0)
3337
- CwlCatchException (1.0.2)
3438
- CwlPreconditionTesting (1.1.1):
3539
- CwlCatchException
3640
- ReachabilitySwift (5.0.0)
3741
- Starscream (3.1.1)
3842
- SwiftFormat/CLI (0.44.17)
39-
- SwiftLint (0.40.2)
43+
- SwiftLint (0.40.3)
4044

4145
DEPENDENCIES:
4246
- Amplify (from `../../`)
4347
- AmplifyPlugins/AWSCognitoAuthPlugin (from `../../`)
4448
- AmplifyTestCommon (from `../../`)
4549
- AppSyncRealTimeClient (~> 1.4.0)
46-
- AWSMobileClient (~> 2.15.0)
50+
- AWSMobileClient (~> 2.17.0)
4751
- AWSPluginsCore (from `../../`)
4852
- CwlCatchException (from `https://github.com/mattgallagher/CwlCatchException.git`, tag `1.2.0`)
4953
- CwlPreconditionTesting (from `https://github.com/mattgallagher/CwlPreconditionTesting.git`, tag `1.2.0`)
@@ -90,21 +94,21 @@ CHECKOUT OPTIONS:
9094

9195
SPEC CHECKSUMS:
9296
Amplify: 936bb160a853e94be153c2f3f8a250f7090c9ee0
93-
AmplifyPlugins: dda20f2503c4a9e7175fd3d91223113f802f9526
94-
AmplifyTestCommon: 36e282bbc6579e007ffbfe6cbd149f3da9bdd5eb
97+
AmplifyPlugins: 9bedaf428a3c5ea87211c5e1585f6f27c63d50fb
98+
AmplifyTestCommon: bb160ee220ebf5c4da1ba9c2ae44f2069886862f
9599
AppSyncRealTimeClient: 879b9fa3ce3f335450ca06e0def279fa90af9e76
96-
AWSAuthCore: 598e8eb56e12799877414d10b04598de12a15992
97-
AWSCognitoIdentityProvider: 4a721292eda37a8c3ef451e8fec28abe14aff18e
98-
AWSCognitoIdentityProviderASF: 0fb6ea671c05a63276e320726f680cd880522442
99-
AWSCore: 5a8f9d7461dbe5ea6a5473c41cf113b687e19136
100-
AWSMobileClient: 5c29678413764ee3bcd528421331deb0a35b72fb
101-
AWSPluginsCore: c413c27dece5dbf0e9530ae6c01a804998205eb7
100+
AWSAuthCore: 35e63f55ee6fa31b848dfa8fcddbe0fccdba9a13
101+
AWSCognitoIdentityProvider: bbc75ab74931db6909ffd9b24e7f4e52ae210361
102+
AWSCognitoIdentityProviderASF: 87ebf727c8429f93b4188b2ad13ad1f76ce3cefd
103+
AWSCore: f20f7eb426d598ab753219e41ba524c0dc6f2b5c
104+
AWSMobileClient: 45523613684950c049914eacbc9f19cdd9f4cc83
105+
AWSPluginsCore: bfe5b9cb0b464bd18509d885ff8f81501acfa2c0
102106
CwlCatchException: 70a52ae44ea5d46db7bd385f801a94942420cd8c
103107
CwlPreconditionTesting: d33a4e4f285c0b885fddcae5dfedfbb34d4f3961
104108
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
105109
Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
106110
SwiftFormat: 3b5caa6389b2b9adbc00e133b3ccc8c6e687a6a4
107-
SwiftLint: 1216c910d27c2633ade33b4f071bb6b930982e62
111+
SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7
108112

109113
PODFILE CHECKSUM: 31880f143dde88382b42400953bbeb67ca4f2ae3
110114

‎AmplifyPlugins/Analytics/Podfile.lock‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,48 @@ PODS:
33
- Amplify/Default (= 1.2.0)
44
- Amplify/Default (1.2.0)
55
- AmplifyPlugins/AWSCognitoAuthPlugin (1.2.0):
6-
- AWSAuthCore (~> 2.15.0)
7-
- AWSCore (~> 2.15.0)
8-
- AWSMobileClient (~> 2.15.0)
6+
- AWSAuthCore (~> 2.17.0)
7+
- AWSCognitoIdentityProvider (~> 2.17.0)
8+
- AWSCognitoIdentityProviderASF (~> 2.17.0)
9+
- AWSCore (~> 2.17.0)
10+
- AWSMobileClient (~> 2.17.0)
911
- AWSPluginsCore (= 1.2.0)
1012
- AmplifyTestCommon (1.2.0):
1113
- Amplify (= 1.2.0)
1214
- AmplifyTestCommon/AWSPluginsTestCommon (= 1.2.0)
1315
- AmplifyTestCommon/AWSPluginsTestCommon (1.2.0):
1416
- Amplify (= 1.2.0)
15-
- AWSCore (~> 2.15.0)
17+
- AWSCore (~> 2.17.0)
1618
- AWSPluginsCore (= 1.2.0)
17-
- AWSAuthCore (2.15.3):
18-
- AWSCore (= 2.15.3)
19-
- AWSCognitoIdentityProvider (2.15.3):
20-
- AWSCognitoIdentityProviderASF (= 1.0.2)
21-
- AWSCore (= 2.15.3)
22-
- AWSCognitoIdentityProviderASF (1.0.2)
23-
- AWSCore (2.15.3)
24-
- AWSMobileClient (2.15.3):
25-
- AWSAuthCore (= 2.15.3)
26-
- AWSCognitoIdentityProvider (= 2.15.3)
27-
- AWSPinpoint (2.15.3):
28-
- AWSCore (= 2.15.3)
19+
- AWSAuthCore (2.17.0):
20+
- AWSCore (= 2.17.0)
21+
- AWSCognitoIdentityProvider (2.17.0):
22+
- AWSCognitoIdentityProviderASF (= 2.17.0)
23+
- AWSCore (= 2.17.0)
24+
- AWSCognitoIdentityProviderASF (2.17.0)
25+
- AWSCore (2.17.0)
26+
- AWSMobileClient (2.17.0):
27+
- AWSAuthCore (= 2.17.0)
28+
- AWSCognitoIdentityProvider (= 2.17.0)
29+
- AWSCognitoIdentityProviderASF (= 2.17.0)
30+
- AWSCore (= 2.17.0)
31+
- AWSPinpoint (2.17.0):
32+
- AWSCore (= 2.17.0)
2933
- AWSPluginsCore (1.2.0):
3034
- Amplify (= 1.2.0)
31-
- AWSCore (~> 2.15.0)
32-
- AWSMobileClient (~> 2.15.0)
35+
- AWSCore (~> 2.17.0)
36+
- AWSMobileClient (~> 2.17.0)
3337
- CwlCatchException (1.0.2)
3438
- CwlPreconditionTesting (1.1.1):
3539
- CwlCatchException
3640
- SwiftFormat/CLI (0.44.17)
37-
- SwiftLint (0.40.2)
41+
- SwiftLint (0.40.3)
3842

3943
DEPENDENCIES:
4044
- Amplify (from `../../`)
4145
- AmplifyPlugins/AWSCognitoAuthPlugin (from `../../`)
4246
- AmplifyTestCommon (from `../../`)
43-
- AWSPinpoint (~> 2.15.0)
47+
- AWSPinpoint (~> 2.17.0)
4448
- AWSPluginsCore (from `../../`)
4549
- CwlCatchException (from `https://github.com/mattgallagher/CwlCatchException.git`, tag `1.2.0`)
4650
- CwlPreconditionTesting (from `https://github.com/mattgallagher/CwlPreconditionTesting.git`, tag `1.2.0`)
@@ -84,19 +88,19 @@ CHECKOUT OPTIONS:
8488

8589
SPEC CHECKSUMS:
8690
Amplify: 936bb160a853e94be153c2f3f8a250f7090c9ee0
87-
AmplifyPlugins: dda20f2503c4a9e7175fd3d91223113f802f9526
88-
AmplifyTestCommon: 36e282bbc6579e007ffbfe6cbd149f3da9bdd5eb
89-
AWSAuthCore: 598e8eb56e12799877414d10b04598de12a15992
90-
AWSCognitoIdentityProvider: 4a721292eda37a8c3ef451e8fec28abe14aff18e
91-
AWSCognitoIdentityProviderASF: 0fb6ea671c05a63276e320726f680cd880522442
92-
AWSCore: 5a8f9d7461dbe5ea6a5473c41cf113b687e19136
93-
AWSMobileClient: 5c29678413764ee3bcd528421331deb0a35b72fb
94-
AWSPinpoint: 6c17e240a104de90643e0afee5741a7528011800
95-
AWSPluginsCore: c413c27dece5dbf0e9530ae6c01a804998205eb7
91+
AmplifyPlugins: 9bedaf428a3c5ea87211c5e1585f6f27c63d50fb
92+
AmplifyTestCommon: bb160ee220ebf5c4da1ba9c2ae44f2069886862f
93+
AWSAuthCore: 35e63f55ee6fa31b848dfa8fcddbe0fccdba9a13
94+
AWSCognitoIdentityProvider: bbc75ab74931db6909ffd9b24e7f4e52ae210361
95+
AWSCognitoIdentityProviderASF: 87ebf727c8429f93b4188b2ad13ad1f76ce3cefd
96+
AWSCore: f20f7eb426d598ab753219e41ba524c0dc6f2b5c
97+
AWSMobileClient: 45523613684950c049914eacbc9f19cdd9f4cc83
98+
AWSPinpoint: 6a8997ee78bd81e7a825d8f39074ff6a73cc563d
99+
AWSPluginsCore: bfe5b9cb0b464bd18509d885ff8f81501acfa2c0
96100
CwlCatchException: 70a52ae44ea5d46db7bd385f801a94942420cd8c
97101
CwlPreconditionTesting: d33a4e4f285c0b885fddcae5dfedfbb34d4f3961
98102
SwiftFormat: 3b5caa6389b2b9adbc00e133b3ccc8c6e687a6a4
99-
SwiftLint: 1216c910d27c2633ade33b4f071bb6b930982e62
103+
SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7
100104

101105
PODFILE CHECKSUM: 48d1574dddce5cef7bdb7b05b06fc588ee22956e
102106

‎AmplifyPlugins/Auth/Podfile.lock‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,34 @@ PODS:
77
- AmplifyTestCommon/AWSPluginsTestCommon (= 1.2.0)
88
- AmplifyTestCommon/AWSPluginsTestCommon (1.2.0):
99
- Amplify (= 1.2.0)
10-
- AWSCore (~> 2.15.0)
10+
- AWSCore (~> 2.17.0)
1111
- AWSPluginsCore (= 1.2.0)
12-
- AWSAuthCore (2.15.3):
13-
- AWSCore (= 2.15.3)
14-
- AWSCognitoIdentityProvider (2.15.3):
15-
- AWSCognitoIdentityProviderASF (= 1.0.2)
16-
- AWSCore (= 2.15.3)
17-
- AWSCognitoIdentityProviderASF (1.0.2)
18-
- AWSCore (2.15.3)
19-
- AWSMobileClient (2.15.3):
20-
- AWSAuthCore (= 2.15.3)
21-
- AWSCognitoIdentityProvider (= 2.15.3)
12+
- AWSAuthCore (2.17.0):
13+
- AWSCore (= 2.17.0)
14+
- AWSCognitoIdentityProvider (2.17.0):
15+
- AWSCognitoIdentityProviderASF (= 2.17.0)
16+
- AWSCore (= 2.17.0)
17+
- AWSCognitoIdentityProviderASF (2.17.0)
18+
- AWSCore (2.17.0)
19+
- AWSMobileClient (2.17.0):
20+
- AWSAuthCore (= 2.17.0)
21+
- AWSCognitoIdentityProvider (= 2.17.0)
22+
- AWSCognitoIdentityProviderASF (= 2.17.0)
23+
- AWSCore (= 2.17.0)
2224
- AWSPluginsCore (1.2.0):
2325
- Amplify (= 1.2.0)
24-
- AWSCore (~> 2.15.0)
25-
- AWSMobileClient (~> 2.15.0)
26+
- AWSCore (~> 2.17.0)
27+
- AWSMobileClient (~> 2.17.0)
2628
- CwlCatchException (1.0.2)
2729
- CwlPreconditionTesting (1.1.1):
2830
- CwlCatchException
2931
- SwiftFormat/CLI (0.44.17)
30-
- SwiftLint (0.40.2)
32+
- SwiftLint (0.40.3)
3133

3234
DEPENDENCIES:
3335
- Amplify (from `../../`)
3436
- AmplifyTestCommon (from `../../`)
35-
- AWSMobileClient (~> 2.15.0)
37+
- AWSMobileClient (~> 2.17.0)
3638
- AWSPluginsCore (from `../../`)
3739
- CwlCatchException (from `https://github.com/mattgallagher/CwlCatchException.git`, tag `1.2.0`)
3840
- CwlPreconditionTesting (from `https://github.com/mattgallagher/CwlPreconditionTesting.git`, tag `1.2.0`)
@@ -73,17 +75,17 @@ CHECKOUT OPTIONS:
7375

7476
SPEC CHECKSUMS:
7577
Amplify: 936bb160a853e94be153c2f3f8a250f7090c9ee0
76-
AmplifyTestCommon: 36e282bbc6579e007ffbfe6cbd149f3da9bdd5eb
77-
AWSAuthCore: 598e8eb56e12799877414d10b04598de12a15992
78-
AWSCognitoIdentityProvider: 4a721292eda37a8c3ef451e8fec28abe14aff18e
79-
AWSCognitoIdentityProviderASF: 0fb6ea671c05a63276e320726f680cd880522442
80-
AWSCore: 5a8f9d7461dbe5ea6a5473c41cf113b687e19136
81-
AWSMobileClient: 5c29678413764ee3bcd528421331deb0a35b72fb
82-
AWSPluginsCore: c413c27dece5dbf0e9530ae6c01a804998205eb7
78+
AmplifyTestCommon: bb160ee220ebf5c4da1ba9c2ae44f2069886862f
79+
AWSAuthCore: 35e63f55ee6fa31b848dfa8fcddbe0fccdba9a13
80+
AWSCognitoIdentityProvider: bbc75ab74931db6909ffd9b24e7f4e52ae210361
81+
AWSCognitoIdentityProviderASF: 87ebf727c8429f93b4188b2ad13ad1f76ce3cefd
82+
AWSCore: f20f7eb426d598ab753219e41ba524c0dc6f2b5c
83+
AWSMobileClient: 45523613684950c049914eacbc9f19cdd9f4cc83
84+
AWSPluginsCore: bfe5b9cb0b464bd18509d885ff8f81501acfa2c0
8385
CwlCatchException: 70a52ae44ea5d46db7bd385f801a94942420cd8c
8486
CwlPreconditionTesting: d33a4e4f285c0b885fddcae5dfedfbb34d4f3961
8587
SwiftFormat: 3b5caa6389b2b9adbc00e133b3ccc8c6e687a6a4
86-
SwiftLint: 1216c910d27c2633ade33b4f071bb6b930982e62
88+
SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7
8789

8890
PODFILE CHECKSUM: 371cf67fe35ebb5167d0880bad12b01618a0fb0e
8991

0 commit comments

Comments
 (0)