Skip to content

Commit dbea5ff

Browse files
drochettidrochetti
authored
fix(build): podspec source version tag and url (#538)
1 parent d526c61 commit dbea5ff

23 files changed

+778
-125
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ package-lock.json
3636
######################
3737
*credentials.json
3838
Pods
39-
Podfile.lock
4039
Documentation
4140
Scripts/build.sh
4241
Scripts/gcovr

‎AWSPluginsCore.podspec‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,31 @@
66
# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
77
#
88

9-
Pod::Spec.new do |s|
10-
AMPLIFY_VERSION = '1.0.1'
11-
AWS_SDK_VERSION = "~> 2.13.4"
9+
load 'build-support/dependencies.rb'
1210

11+
Pod::Spec.new do |s|
1312
s.name = 'AWSPluginsCore'
1413

15-
s.version = AMPLIFY_VERSION
14+
s.version = $AMPLIFY_VERSION
1615
s.summary = 'Amazon Web Services Amplify for iOS.'
1716

1817
s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services'
1918

20-
s.homepage = 'https://aws.amazon.com/amplify/'
19+
s.homepage = 'https://github.com/aws-amplify/amplify-ios'
2120
s.license = 'Apache License, Version 2.0'
2221
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
23-
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => s.version}
22+
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => release_tag() }
2423

2524
s.platform = :ios, '11.0'
2625
s.swift_version = '5.0'
2726

2827
s.source_files = 'AmplifyPlugins/Core/AWSPluginsCore/**/*.swift'
2928

30-
s.dependency 'Amplify', AMPLIFY_VERSION
31-
s.dependency 'AWSMobileClient', AWS_SDK_VERSION
29+
s.dependency 'Amplify', $AMPLIFY_VERSION
30+
s.dependency 'AWSMobileClient', optimistic_version($AWS_SDK_VERSION)
3231

3332
# This is technically redundant, but adding it here allows Xcode to find it
3433
# during initial indexing and prevent build errors after a fresh install
35-
s.dependency 'AWSCore', AWS_SDK_VERSION
34+
s.dependency 'AWSCore', optimistic_version($AWS_SDK_VERSION)
3635

3736
end

‎AWSPredictionsPlugin.podspec‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
1-
Pod::Spec.new do |s|
2-
AMPLIFY_VERSION = '1.0.1'
3-
AWS_SDK_VERSION = '~> 2.13.4'
1+
load 'build-support/dependencies.rb'
42

3+
Pod::Spec.new do |s|
54
s.name = 'AWSPredictionsPlugin'
65

7-
s.version = AMPLIFY_VERSION
6+
s.version = $AMPLIFY_VERSION
87
s.summary = 'Amazon Web Services Amplify for iOS.'
98

109
s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services'
1110

12-
s.homepage = 'https://aws.amazon.com/amplify/'
11+
s.homepage = 'https://github.com/aws-amplify/amplify-ios'
1312
s.license = 'Apache License, Version 2.0'
1413
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
15-
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => s.version}
14+
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => release_tag() }
1615

1716
s.platform = :ios, '13.0'
1817
s.swift_version = '5.0'
1918

2019
s.source_files = 'AmplifyPlugins/Predictions/AWSPredictionsPlugin/**/*.swift'
2120

22-
s.dependency 'AWSComprehend', AWS_SDK_VERSION
23-
s.dependency 'AWSPluginsCore', AMPLIFY_VERSION
24-
s.dependency 'AWSPolly', AWS_SDK_VERSION
25-
s.dependency 'AWSRekognition', AWS_SDK_VERSION
26-
s.dependency 'AWSTextract', AWS_SDK_VERSION
27-
s.dependency 'AWSTranscribeStreaming', AWS_SDK_VERSION
28-
s.dependency 'AWSTranslate', AWS_SDK_VERSION
29-
s.dependency 'CoreMLPredictionsPlugin', AMPLIFY_VERSION
21+
s.dependency 'AWSComprehend', optimistic_version($AWS_SDK_VERSION)
22+
s.dependency 'AWSPluginsCore', $AMPLIFY_VERSION
23+
s.dependency 'AWSPolly', optimistic_version($AWS_SDK_VERSION)
24+
s.dependency 'AWSRekognition', optimistic_version($AWS_SDK_VERSION)
25+
s.dependency 'AWSTextract', optimistic_version($AWS_SDK_VERSION)
26+
s.dependency 'AWSTranscribeStreaming', optimistic_version($AWS_SDK_VERSION)
27+
s.dependency 'AWSTranslate', optimistic_version($AWS_SDK_VERSION)
28+
s.dependency 'CoreMLPredictionsPlugin', $AMPLIFY_VERSION
3029

3130
# This is technically redundant, but adding it here allows Xcode to find it
3231
# during initial indexing and prevent build errors after a fresh install
33-
s.dependency 'AWSCore', AWS_SDK_VERSION
32+
s.dependency 'AWSCore', optimistic_version($AWS_SDK_VERSION)
3433

3534
end

‎Amplify.podspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
77
#
88

9-
Pod::Spec.new do |s|
10-
AMPLIFY_VERSION = '1.0.1'
9+
load 'build-support/dependencies.rb'
1110

11+
Pod::Spec.new do |s|
1212
s.name = 'Amplify'
13-
s.version = AMPLIFY_VERSION
13+
s.version = $AMPLIFY_VERSION
1414
s.summary = 'Amazon Web Services Amplify for iOS.'
1515

1616
s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services'
1717

18-
s.homepage = 'https://aws.amazon.com/amplify/'
18+
s.homepage = 'https://github.com/aws-amplify/amplify-ios'
1919
s.license = 'Apache License, Version 2.0'
2020
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
21-
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => s.version}
21+
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => release_tag() }
2222

2323
s.platform = :ios, '11.0'
2424
s.swift_version = '5.0'

‎AmplifyPlugins.podspec‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,28 @@
66
# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
77
#
88

9-
Pod::Spec.new do |s|
10-
AMPLIFY_VERSION = '1.0.1'
11-
AWS_SDK_VERSION = '~> 2.13.4'
9+
load 'build-support/dependencies.rb'
1210

11+
Pod::Spec.new do |s|
1312
s.name = 'AmplifyPlugins'
14-
s.version = AMPLIFY_VERSION
13+
s.version = $AMPLIFY_VERSION
1514
s.summary = 'Amazon Web Services Amplify for iOS.'
1615

1716
s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services'
1817

19-
s.homepage = 'https://aws.amazon.com/amplify/'
18+
s.homepage = 'https://github.com/aws-amplify/amplify-ios'
2019
s.license = 'Apache License, Version 2.0'
2120
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
22-
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => s.version}
21+
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => release_tag() }
2322

2423
s.platform = :ios, '11.0'
2524
s.swift_version = '5.0'
2625

27-
s.dependency 'AWSPluginsCore', AMPLIFY_VERSION
26+
s.dependency 'AWSPluginsCore', $AMPLIFY_VERSION
2827

2928
# This is technically redundant, but adding it here allows Xcode to find it
3029
# during initial indexing and prevent build errors after a fresh install
31-
s.dependency 'AWSCore', AWS_SDK_VERSION
30+
s.dependency 'AWSCore', optimistic_version($AWS_SDK_VERSION)
3231

3332
s.subspec 'AWSAPIPlugin' do |ss|
3433
ss.source_files = 'AmplifyPlugins/API/AWSAPICategoryPlugin/**/*.swift'
@@ -38,11 +37,11 @@ Pod::Spec.new do |s|
3837

3938
s.subspec 'AWSCognitoAuthPlugin' do |ss|
4039
ss.source_files = 'AmplifyPlugins/Auth/AWSCognitoAuthPlugin/**/*.swift'
41-
ss.dependency 'AWSMobileClient', AWS_SDK_VERSION
40+
ss.dependency 'AWSMobileClient', optimistic_version($AWS_SDK_VERSION)
4241

4342
# This is technically redundant, but adding it here allows Xcode to find it
4443
# during initial indexing and prevent build errors after a fresh install
45-
s.dependency 'AWSAuthCore', AWS_SDK_VERSION
44+
s.dependency 'AWSAuthCore', optimistic_version($AWS_SDK_VERSION)
4645

4746
end
4847

@@ -53,12 +52,12 @@ Pod::Spec.new do |s|
5352

5453
s.subspec 'AWSPinpointAnalyticsPlugin' do |ss|
5554
ss.source_files = 'AmplifyPlugins/Analytics/AWSPinpointAnalyticsPlugin/**/*.swift'
56-
ss.dependency 'AWSPinpoint', AWS_SDK_VERSION
55+
ss.dependency 'AWSPinpoint', optimistic_version($AWS_SDK_VERSION)
5756
end
5857

5958
s.subspec 'AWSS3StoragePlugin' do |ss|
6059
ss.source_files = 'AmplifyPlugins/Storage/AWSS3StoragePlugin/**/*.swift'
61-
ss.dependency 'AWSS3', AWS_SDK_VERSION
60+
ss.dependency 'AWSS3', optimistic_version($AWS_SDK_VERSION)
6261
end
6362

6463
end

‎AmplifyPlugins/API/Podfile‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
load '../../build-support/dependencies.rb'
2+
13
platform :ios, '11.0'
24
use_frameworks!
35

4-
AWS_SDK_VERSION = "2.13.0"
5-
6-
pod 'SwiftFormat/CLI'
7-
pod 'SwiftLint'
6+
include_build_tools!
87

98
target 'AWSAPICategoryPlugin' do
109
pod 'Amplify', :path => '../../'
@@ -15,20 +14,18 @@ target 'AWSAPICategoryPlugin' do
1514
target "AWSAPICategoryPluginTests" do
1615
inherit! :complete
1716

18-
pod "CwlPreconditionTesting", :git => "https://github.com/mattgallagher/CwlPreconditionTesting.git", :tag => "1.2.0"
19-
pod "CwlCatchException", :git => "https://github.com/mattgallagher/CwlCatchException.git", :tag => "1.2.0"
17+
include_test_utilities!
2018
pod 'AmplifyTestCommon', :path => '../../'
2119
pod "ReachabilitySwift", "~> 5.0.0"
2220
end
2321
end
2422

2523
target "HostApp" do
2624
use_frameworks!
27-
pod "CwlPreconditionTesting", :git => "https://github.com/mattgallagher/CwlPreconditionTesting.git", :tag => "1.2.0"
28-
pod "CwlCatchException", :git => "https://github.com/mattgallagher/CwlCatchException.git", :tag => "1.2.0"
25+
include_test_utilities!
2926
pod 'AmplifyTestCommon', :path => '../../'
3027
pod 'Amplify', :path => '../../'
31-
pod "AWSMobileClient", "~> #{AWS_SDK_VERSION}"
28+
pod "AWSMobileClient", optimistic_version($AWS_SDK_VERSION)
3229

3330
target "AWSAPICategoryPluginTestCommon" do
3431
inherit! :complete

‎AmplifyPlugins/API/Podfile.lock‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
PODS:
2+
- Amplify (1.0.1):
3+
- Amplify/Default (= 1.0.1)
4+
- Amplify/Default (1.0.1)
5+
- AmplifyPlugins/AWSCognitoAuthPlugin (1.0.1):
6+
- AWSAuthCore (~> 2.13.4)
7+
- AWSCore (~> 2.13.4)
8+
- AWSMobileClient (~> 2.13.4)
9+
- AWSPluginsCore (= 1.0.1)
10+
- AmplifyTestCommon (1.0.1):
11+
- Amplify (= 1.0.1)
12+
- AmplifyTestCommon/AWSPluginsTestCommon (= 1.0.1)
13+
- AmplifyTestCommon/AWSPluginsTestCommon (1.0.1):
14+
- Amplify (= 1.0.1)
15+
- AWSCore (~> 2.13.4)
16+
- AWSPluginsCore (= 1.0.1)
17+
- AppSyncRealTimeClient (1.1.6):
18+
- Starscream (= 3.0.6)
19+
- AWSAuthCore (2.13.4):
20+
- AWSCore (= 2.13.4)
21+
- AWSCognitoIdentityProvider (2.13.4):
22+
- AWSCognitoIdentityProviderASF (= 1.0.1)
23+
- AWSCore (= 2.13.4)
24+
- AWSCognitoIdentityProviderASF (1.0.1)
25+
- AWSCore (2.13.4)
26+
- AWSMobileClient (2.13.4):
27+
- AWSAuthCore (= 2.13.4)
28+
- AWSCognitoIdentityProvider (= 2.13.4)
29+
- AWSPluginsCore (1.0.1):
30+
- Amplify (= 1.0.1)
31+
- AWSCore (~> 2.13.4)
32+
- AWSMobileClient (~> 2.13.4)
33+
- CwlCatchException (1.0.2)
34+
- CwlPreconditionTesting (1.1.1):
35+
- CwlCatchException
36+
- ReachabilitySwift (5.0.0)
37+
- Starscream (3.0.6)
38+
- SwiftFormat/CLI (0.44.13)
39+
- SwiftLint (0.39.2)
40+
41+
DEPENDENCIES:
42+
- Amplify (from `../../`)
43+
- AmplifyPlugins/AWSCognitoAuthPlugin (from `../../`)
44+
- AmplifyTestCommon (from `../../`)
45+
- AppSyncRealTimeClient (~> 1.1.0)
46+
- AWSMobileClient (~> 2.13.4)
47+
- AWSPluginsCore (from `../../`)
48+
- CwlCatchException (from `https://github.com/mattgallagher/CwlCatchException.git`, tag `1.2.0`)
49+
- CwlPreconditionTesting (from `https://github.com/mattgallagher/CwlPreconditionTesting.git`, tag `1.2.0`)
50+
- ReachabilitySwift (~> 5.0.0)
51+
- SwiftFormat/CLI
52+
- SwiftLint
53+
54+
SPEC REPOS:
55+
https://cdn.cocoapods.org/:
56+
- AppSyncRealTimeClient
57+
- AWSAuthCore
58+
- AWSCognitoIdentityProvider
59+
- AWSCognitoIdentityProviderASF
60+
- AWSCore
61+
- AWSMobileClient
62+
- ReachabilitySwift
63+
- Starscream
64+
- SwiftFormat
65+
- SwiftLint
66+
67+
EXTERNAL SOURCES:
68+
Amplify:
69+
:path: "../../"
70+
AmplifyPlugins:
71+
:path: "../../"
72+
AmplifyTestCommon:
73+
:path: "../../"
74+
AWSPluginsCore:
75+
:path: "../../"
76+
CwlCatchException:
77+
:git: https://github.com/mattgallagher/CwlCatchException.git
78+
:tag: 1.2.0
79+
CwlPreconditionTesting:
80+
:git: https://github.com/mattgallagher/CwlPreconditionTesting.git
81+
:tag: 1.2.0
82+
83+
CHECKOUT OPTIONS:
84+
CwlCatchException:
85+
:git: https://github.com/mattgallagher/CwlCatchException.git
86+
:tag: 1.2.0
87+
CwlPreconditionTesting:
88+
:git: https://github.com/mattgallagher/CwlPreconditionTesting.git
89+
:tag: 1.2.0
90+
91+
SPEC CHECKSUMS:
92+
Amplify: 58bd74cef8478c40e93df97db8d6e97db645f849
93+
AmplifyPlugins: 7847bd4bbe97743443f5d9fabd026b1c097cbb2e
94+
AmplifyTestCommon: 81f2cb494229ebbc0cadbe7c7044e7484182b727
95+
AppSyncRealTimeClient: 4a2ccdc1722750a1f4d76e216f9bfb1cf12f10de
96+
AWSAuthCore: 72b4bd064c28985ea5345c62759632d511de342a
97+
AWSCognitoIdentityProvider: a2d1d2857316519c018c03ac8205cf78154db5c0
98+
AWSCognitoIdentityProviderASF: f94f1a502e72ef3d0a1de93e10bf7a79c8698118
99+
AWSCore: 06beea22b6bdbfe9f5ab5015c6901e8475c746a8
100+
AWSMobileClient: 33ecce524fbc011d543dae8306ca29a43ecb72e5
101+
AWSPluginsCore: b6fb2dc62e35a24261544709826e142c0c082c6f
102+
CwlCatchException: 70a52ae44ea5d46db7bd385f801a94942420cd8c
103+
CwlPreconditionTesting: d33a4e4f285c0b885fddcae5dfedfbb34d4f3961
104+
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
105+
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
106+
SwiftFormat: 87e745cb2f6509894a44ac4f311a8722a9ebcb8b
107+
SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
108+
109+
PODFILE CHECKSUM: c5ca54ced4ba8835a7d63fc7d12880ae4532cb16
110+
111+
COCOAPODS: 1.9.3

‎AmplifyPlugins/Analytics/Podfile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1+
load '../../build-support/dependencies.rb'
2+
13
platform :ios, '11.0'
24
use_frameworks!
35

4-
AWS_SDK_VERSION = "2.13.0"
5-
6-
pod 'SwiftFormat/CLI'
7-
pod 'SwiftLint'
6+
include_build_tools!
87

98
target 'AWSPinpointAnalyticsPlugin' do
109
pod 'Amplify', :path => '../../'
1110
pod 'AWSPluginsCore', :path => '../../'
12-
pod "AWSPinpoint", "~> #{AWS_SDK_VERSION}"
11+
pod "AWSPinpoint", optimistic_version($AWS_SDK_VERSION)
1312
end
1413

1514
target "HostApp" do
1615
use_frameworks!
17-
pod "CwlPreconditionTesting", :git => "https://github.com/mattgallagher/CwlPreconditionTesting.git", :tag => "1.2.0"
18-
pod "CwlCatchException", :git => "https://github.com/mattgallagher/CwlCatchException.git", :tag => "1.2.0"
16+
include_test_utilities!
17+
1918
pod 'AmplifyTestCommon', :path => '../../'
2019
pod 'Amplify', :path => '../../'
2120
pod 'AWSPluginsCore', :path => '../../'

0 commit comments

Comments
 (0)