Skip to content

Commit 7833a01

Browse files
authored
Remove Unnecessary Post-Processing Step (#52)
* Remove unnecessary post-processing step. * Regen binary framework
1 parent 9413b87 commit 7833a01

File tree

64 files changed

+365
-2870
lines changed

Some content is hidden

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

64 files changed

+365
-2870
lines changed

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2.0.1] - 2020-11-17
8+
### Removed
9+
- Fixed module/class name collision which caused Failed to load module 'MailchimpSDK' error when integrating. (#16)
10+
711
## [2.0] - 2020-11-11
812
### Changed
913
- Renamed MailchimpSDK class to Mailchimp to avoid ambiguity.

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22

3-
gem "fastlane", "2.153.1"
4-
gem "cocoapods", "1.9.3"
3+
gem "fastlane", "2.167.0"
4+
gem "cocoapods", "1.10.0"
55

66
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
77
eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,43 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.2)
5-
activesupport (4.2.11.3)
6-
i18n (~> 0.7)
5+
activesupport (5.2.4.4)
6+
concurrent-ruby (~> 1.0, >= 1.0.2)
7+
i18n (>= 0.7, < 2)
78
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
addressable (2.7.0)
1111
public_suffix (>= 2.0.2, < 5.0)
12-
algoliasearch (1.27.3)
12+
algoliasearch (1.27.5)
1313
httpclient (~> 2.8, >= 2.8.3)
1414
json (>= 1.5.1)
1515
atomos (0.1.3)
1616
aws-eventstream (1.1.0)
17-
aws-partitions (1.345.0)
18-
aws-sdk-core (3.104.3)
17+
aws-partitions (1.393.0)
18+
aws-sdk-core (3.109.2)
1919
aws-eventstream (~> 1, >= 1.0.2)
2020
aws-partitions (~> 1, >= 1.239.0)
2121
aws-sigv4 (~> 1.1)
2222
jmespath (~> 1.0)
23-
aws-sdk-kms (1.36.0)
24-
aws-sdk-core (~> 3, >= 3.99.0)
23+
aws-sdk-kms (1.39.0)
24+
aws-sdk-core (~> 3, >= 3.109.0)
2525
aws-sigv4 (~> 1.1)
26-
aws-sdk-s3 (1.75.0)
27-
aws-sdk-core (~> 3, >= 3.104.1)
26+
aws-sdk-s3 (1.84.1)
27+
aws-sdk-core (~> 3, >= 3.109.0)
2828
aws-sdk-kms (~> 1)
2929
aws-sigv4 (~> 1.1)
30-
aws-sigv4 (1.2.1)
30+
aws-sigv4 (1.2.2)
3131
aws-eventstream (~> 1, >= 1.0.2)
32-
babosa (1.0.3)
32+
babosa (1.0.4)
3333
claide (1.0.3)
34-
cocoapods (1.9.3)
35-
activesupport (>= 4.0.2, < 5)
34+
cocoapods (1.10.0)
35+
addressable (~> 2.6)
3636
claide (>= 1.0.2, < 2.0)
37-
cocoapods-core (= 1.9.3)
37+
cocoapods-core (= 1.10.0)
3838
cocoapods-deintegrate (>= 1.0.3, < 2.0)
39-
cocoapods-downloader (>= 1.2.2, < 2.0)
39+
cocoapods-downloader (>= 1.4.0, < 2.0)
4040
cocoapods-plugins (>= 1.0.0, < 2.0)
4141
cocoapods-search (>= 1.0.0, < 2.0)
42-
cocoapods-stats (>= 1.0.0, < 2.0)
4342
cocoapods-trunk (>= 1.4.0, < 2.0)
4443
cocoapods-try (>= 1.1.0, < 2.0)
4544
colored2 (~> 3.1)
@@ -49,21 +48,22 @@ GEM
4948
molinillo (~> 0.6.6)
5049
nap (~> 1.0)
5150
ruby-macho (~> 1.4)
52-
xcodeproj (>= 1.14.0, < 2.0)
53-
cocoapods-core (1.9.3)
54-
activesupport (>= 4.0.2, < 6)
51+
xcodeproj (>= 1.19.0, < 2.0)
52+
cocoapods-core (1.10.0)
53+
activesupport (> 5.0, < 6)
54+
addressable (~> 2.6)
5555
algoliasearch (~> 1.0)
5656
concurrent-ruby (~> 1.1)
5757
fuzzy_match (~> 2.0.4)
5858
nap (~> 1.0)
5959
netrc (~> 0.11)
60+
public_suffix
6061
typhoeus (~> 1.0)
6162
cocoapods-deintegrate (1.0.4)
6263
cocoapods-downloader (1.4.0)
6364
cocoapods-plugins (1.0.0)
6465
nap
6566
cocoapods-search (1.0.0)
66-
cocoapods-stats (1.1.0)
6767
cocoapods-trunk (1.5.0)
6868
nap (>= 0.8, < 2.0)
6969
netrc (~> 0.11)
@@ -72,28 +72,29 @@ GEM
7272
colored2 (3.1.2)
7373
commander-fastlane (4.4.6)
7474
highline (~> 1.7.2)
75-
concurrent-ruby (1.1.6)
75+
concurrent-ruby (1.1.7)
7676
declarative (0.0.20)
7777
declarative-option (0.1.0)
7878
digest-crc (0.6.1)
7979
rake (~> 13.0)
8080
domain_name (0.5.20190701)
8181
unf (>= 0.0.5, < 1.0.0)
8282
dotenv (2.7.6)
83-
emoji_regex (3.0.0)
83+
emoji_regex (3.2.1)
8484
escape (0.0.4)
8585
ethon (0.12.0)
8686
ffi (>= 1.3.0)
87-
excon (0.76.0)
88-
faraday (1.0.1)
87+
excon (0.78.0)
88+
faraday (1.1.0)
8989
multipart-post (>= 1.2, < 3)
90-
faraday-cookie_jar (0.0.6)
91-
faraday (>= 0.7.4)
90+
ruby2_keywords
91+
faraday-cookie_jar (0.0.7)
92+
faraday (>= 0.8.0)
9293
http-cookie (~> 1.0.0)
9394
faraday_middleware (1.0.0)
9495
faraday (~> 1.0)
9596
fastimage (2.2.0)
96-
fastlane (2.153.1)
97+
fastlane (2.167.0)
9798
CFPropertyList (>= 2.3, < 4.0.0)
9899
addressable (>= 2.3, < 3.0.0)
99100
aws-sdk-s3 (~> 1.0)
@@ -129,7 +130,7 @@ GEM
129130
xcodeproj (>= 1.13.0, < 2.0.0)
130131
xcpretty (~> 0.3.0)
131132
xcpretty-travis-formatter (>= 0.0.3)
132-
fastlane-plugin-versioning (0.4.3)
133+
fastlane-plugin-versioning (0.4.4)
133134
ffi (1.13.1)
134135
fourflusher (2.3.1)
135136
fuzzy_match (2.0.4)
@@ -145,17 +146,17 @@ GEM
145146
google-cloud-core (1.5.0)
146147
google-cloud-env (~> 1.0)
147148
google-cloud-errors (~> 1.0)
148-
google-cloud-env (1.3.3)
149+
google-cloud-env (1.4.0)
149150
faraday (>= 0.17.3, < 2.0)
150151
google-cloud-errors (1.0.1)
151-
google-cloud-storage (1.26.2)
152+
google-cloud-storage (1.29.1)
152153
addressable (~> 2.5)
153154
digest-crc (~> 0.4)
154155
google-api-client (~> 0.33)
155156
google-cloud-core (~> 1.2)
156157
googleauth (~> 0.9)
157158
mini_mime (~> 1.0)
158-
googleauth (0.13.0)
159+
googleauth (0.14.0)
159160
faraday (>= 0.17.3, < 2.0)
160161
jwt (>= 1.4, < 3.0)
161162
memoist (~> 0.16)
@@ -166,25 +167,25 @@ GEM
166167
http-cookie (1.0.3)
167168
domain_name (~> 0.5)
168169
httpclient (2.8.3)
169-
i18n (0.9.5)
170+
i18n (1.8.5)
170171
concurrent-ruby (~> 1.0)
171172
jmespath (1.4.0)
172173
json (2.3.1)
173-
jwt (2.2.1)
174+
jwt (2.2.2)
174175
memoist (0.16.2)
175-
mini_magick (4.10.1)
176+
mini_magick (4.11.0)
176177
mini_mime (1.0.2)
177-
minitest (5.14.1)
178+
minitest (5.14.2)
178179
molinillo (0.6.6)
179180
multi_json (1.15.0)
180181
multipart-post (2.0.0)
181182
nanaimo (0.3.0)
182183
nap (1.1.0)
183184
naturally (2.2.0)
184185
netrc (0.11.0)
185-
os (1.1.0)
186+
os (1.1.1)
186187
plist (3.5.0)
187-
public_suffix (4.0.5)
188+
public_suffix (4.0.6)
188189
rake (13.0.1)
189190
representable (3.0.4)
190191
declarative (< 0.1.0)
@@ -193,6 +194,7 @@ GEM
193194
retriable (3.1.2)
194195
rouge (2.0.7)
195196
ruby-macho (1.4.0)
197+
ruby2_keywords (0.0.2)
196198
rubyzip (2.3.0)
197199
security (0.1.3)
198200
signet (0.14.0)
@@ -214,15 +216,15 @@ GEM
214216
tty-cursor (~> 0.7)
215217
typhoeus (1.4.0)
216218
ethon (>= 0.9.0)
217-
tzinfo (1.2.7)
219+
tzinfo (1.2.8)
218220
thread_safe (~> 0.1)
219221
uber (0.1.0)
220222
unf (0.1.4)
221223
unf_ext
222224
unf_ext (0.0.7.7)
223225
unicode-display_width (1.7.0)
224226
word_wrap (1.0.0)
225-
xcodeproj (1.17.1)
227+
xcodeproj (1.19.0)
226228
CFPropertyList (>= 2.3.3, < 4.0)
227229
atomos (~> 0.1.3)
228230
claide (>= 1.0.2, < 2.0)
@@ -237,8 +239,8 @@ PLATFORMS
237239
ruby
238240

239241
DEPENDENCIES
240-
cocoapods (= 1.9.3)
241-
fastlane (= 2.153.1)
242+
cocoapods (= 1.10.0)
243+
fastlane (= 2.167.0)
242244
fastlane-plugin-versioning
243245

244246
BUNDLED WITH

MailchimpSDK.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'MailchimpSDK'
11-
s.version = '2.0'
11+
s.version = '2.0.1'
1212
s.summary = 'Mailchimp SDK for iOS'
1313

1414
s.description = <<-DESC

MailchimpSDK/MailchimpSDK.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@
511511
"@executable_path/Frameworks",
512512
"@loader_path/Frameworks",
513513
);
514-
MARKETING_VERSION = 2.0;
514+
MARKETING_VERSION = 2.0.1;
515515
PRODUCT_BUNDLE_IDENTIFIER = com.theRocketScienceGroup.MailchimpSDK;
516516
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
517517
SKIP_INSTALL = YES;
@@ -540,7 +540,7 @@
540540
"@executable_path/Frameworks",
541541
"@loader_path/Frameworks",
542542
);
543-
MARKETING_VERSION = 2.0;
543+
MARKETING_VERSION = 2.0.1;
544544
PRODUCT_BUNDLE_IDENTIFIER = com.theRocketScienceGroup.MailchimpSDK;
545545
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
546546
SKIP_INSTALL = YES;
@@ -560,7 +560,7 @@
560560
"@executable_path/Frameworks",
561561
"@loader_path/Frameworks",
562562
);
563-
MARKETING_VERSION = 2.0;
563+
MARKETING_VERSION = 2.0.1;
564564
PRODUCT_BUNDLE_IDENTIFIER = "com.theRocketScienceGroup.Mailchimp-SDKTests";
565565
PRODUCT_NAME = "$(TARGET_NAME)";
566566
SWIFT_VERSION = 5.0;
@@ -579,7 +579,7 @@
579579
"@executable_path/Frameworks",
580580
"@loader_path/Frameworks",
581581
);
582-
MARKETING_VERSION = 2.0;
582+
MARKETING_VERSION = 2.0.1;
583583
PRODUCT_BUNDLE_IDENTIFIER = "com.theRocketScienceGroup.Mailchimp-SDKTests";
584584
PRODUCT_NAME = "$(TARGET_NAME)";
585585
SWIFT_VERSION = 5.0;

MailchimpSDK/MailchimpSDK/SDK/Mailchimp.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class Mailchimp: NSObject {
2828
public static var debugMode: Bool = false
2929

3030
/// Version of this SDK.
31-
public static let version: String = "0.1.2"
31+
public static let version: String = "2.0.1"
3232

3333
/// The API protocol conforming object that processes requests for this class.
3434
static var api: API?

0 commit comments

Comments
 (0)