Skip to content

Commit 39ffa4a

Browse files
authored
Merge pull request #35 from ccmailchimp/cc/project_wide_updates
Project-wide updates
2 parents 2349c62 + 95ee81a commit 39ffa4a

File tree

87 files changed

+1269
-871
lines changed

Some content is hidden

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

87 files changed

+1269
-871
lines changed

.github/workflows/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616

1717
stale-issue-message: 'This issue is being marked as stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
1818
stale-issue-label: 'stale'
19-
exempt-issue-labels: 'stale-exempt' # Comma seperated list of labels that should be used to exempt an issue from being marked as stale or being closed
19+
exempt-issue-labels: 'stale-exempt' # Comma separated list of labels that should be used to exempt an issue from being marked as stale or being closed
2020

2121
stale-pr-message: 'This Pull Request is being marked as stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
2222
stale-pr-label: 'stale'
23-
exempt-pr-labels: 'stale-exempt' # Comma seperated list of labels that should be used to exempt a PR from being marked as stale or being closed
23+
exempt-pr-labels: 'stale-exempt' # Comma separated list of labels that should be used to exempt a PR from being marked as stale or being closed
2424

2525
days-before-stale: 30
2626
days-before-close: 5

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ 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+
## [1.1.0] - 2023-05-01
8+
### Updates
9+
- Update dependencies
10+
- Update or remove deprecations
11+
- Update to ViewBinding and remove Kotlinx Synthetics
12+
- Small other cleanups
13+
714
## [1.0.0] - 2020-07-15
815
### Mailchimp SDK is now out of Beta.
916

Gemfile.lock

Lines changed: 140 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,102 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.2)
5-
addressable (2.7.0)
6-
public_suffix (>= 2.0.2, < 5.0)
4+
CFPropertyList (3.0.6)
5+
rexml
6+
addressable (2.8.4)
7+
public_suffix (>= 2.0.2, < 6.0)
8+
artifactory (3.0.15)
79
atomos (0.1.3)
8-
babosa (1.0.3)
9-
claide (1.0.3)
10+
aws-eventstream (1.2.0)
11+
aws-partitions (1.758.0)
12+
aws-sdk-core (3.171.0)
13+
aws-eventstream (~> 1, >= 1.0.2)
14+
aws-partitions (~> 1, >= 1.651.0)
15+
aws-sigv4 (~> 1.5)
16+
jmespath (~> 1, >= 1.6.1)
17+
aws-sdk-kms (1.64.0)
18+
aws-sdk-core (~> 3, >= 3.165.0)
19+
aws-sigv4 (~> 1.1)
20+
aws-sdk-s3 (1.121.0)
21+
aws-sdk-core (~> 3, >= 3.165.0)
22+
aws-sdk-kms (~> 1)
23+
aws-sigv4 (~> 1.4)
24+
aws-sigv4 (1.5.2)
25+
aws-eventstream (~> 1, >= 1.0.2)
26+
babosa (1.0.4)
27+
claide (1.1.0)
1028
colored (1.2)
1129
colored2 (3.1.2)
12-
commander-fastlane (4.4.6)
13-
highline (~> 1.7.2)
14-
declarative (0.0.10)
15-
declarative-option (0.1.0)
16-
digest-crc (0.4.1)
30+
commander (4.6.0)
31+
highline (~> 2.0.0)
32+
declarative (0.0.20)
33+
digest-crc (0.6.4)
34+
rake (>= 12.0.0, < 14.0.0)
1735
domain_name (0.5.20190701)
1836
unf (>= 0.0.5, < 1.0.0)
19-
dotenv (2.7.5)
20-
emoji_regex (1.0.1)
21-
excon (0.71.1)
22-
faraday (0.17.3)
23-
multipart-post (>= 1.2, < 3)
24-
faraday-cookie_jar (0.0.6)
25-
faraday (>= 0.7.4)
37+
dotenv (2.8.1)
38+
emoji_regex (3.2.3)
39+
excon (0.99.0)
40+
faraday (1.10.3)
41+
faraday-em_http (~> 1.0)
42+
faraday-em_synchrony (~> 1.0)
43+
faraday-excon (~> 1.1)
44+
faraday-httpclient (~> 1.0)
45+
faraday-multipart (~> 1.0)
46+
faraday-net_http (~> 1.0)
47+
faraday-net_http_persistent (~> 1.0)
48+
faraday-patron (~> 1.0)
49+
faraday-rack (~> 1.0)
50+
faraday-retry (~> 1.0)
51+
ruby2_keywords (>= 0.0.4)
52+
faraday-cookie_jar (0.0.7)
53+
faraday (>= 0.8.0)
2654
http-cookie (~> 1.0.0)
27-
faraday_middleware (0.13.1)
28-
faraday (>= 0.7.4, < 1.0)
29-
fastimage (2.1.7)
30-
fastlane (2.139.0)
55+
faraday-em_http (1.0.0)
56+
faraday-em_synchrony (1.0.0)
57+
faraday-excon (1.1.0)
58+
faraday-httpclient (1.0.1)
59+
faraday-multipart (1.0.4)
60+
multipart-post (~> 2)
61+
faraday-net_http (1.0.1)
62+
faraday-net_http_persistent (1.2.0)
63+
faraday-patron (1.0.0)
64+
faraday-rack (1.0.0)
65+
faraday-retry (1.0.3)
66+
faraday_middleware (1.2.0)
67+
faraday (~> 1.0)
68+
fastimage (2.2.6)
69+
fastlane (2.212.2)
3170
CFPropertyList (>= 2.3, < 4.0.0)
32-
addressable (>= 2.3, < 3.0.0)
33-
babosa (>= 1.0.2, < 2.0.0)
71+
addressable (>= 2.8, < 3.0.0)
72+
artifactory (~> 3.0)
73+
aws-sdk-s3 (~> 1.0)
74+
babosa (>= 1.0.3, < 2.0.0)
3475
bundler (>= 1.12.0, < 3.0.0)
3576
colored
36-
commander-fastlane (>= 4.4.6, < 5.0.0)
77+
commander (~> 4.6)
3778
dotenv (>= 2.1.1, < 3.0.0)
38-
emoji_regex (>= 0.1, < 2.0)
79+
emoji_regex (>= 0.1, < 4.0)
3980
excon (>= 0.71.0, < 1.0.0)
40-
faraday (~> 0.17)
81+
faraday (~> 1.0)
4182
faraday-cookie_jar (~> 0.0.6)
42-
faraday_middleware (~> 0.13.1)
83+
faraday_middleware (~> 1.0)
4384
fastimage (>= 2.1.0, < 3.0.0)
4485
gh_inspector (>= 1.1.2, < 2.0.0)
45-
google-api-client (>= 0.29.2, < 0.37.0)
46-
google-cloud-storage (>= 1.15.0, < 2.0.0)
47-
highline (>= 1.7.2, < 2.0.0)
86+
google-apis-androidpublisher_v3 (~> 0.3)
87+
google-apis-playcustomapp_v1 (~> 0.1)
88+
google-cloud-storage (~> 1.31)
89+
highline (~> 2.0)
4890
json (< 3.0.0)
49-
jwt (~> 2.1.0)
91+
jwt (>= 2.1.0, < 3)
5092
mini_magick (>= 4.9.4, < 5.0.0)
51-
multi_xml (~> 0.5)
5293
multipart-post (~> 2.0.0)
94+
naturally (~> 2.2)
95+
optparse (~> 0.1.1)
5396
plist (>= 3.1.0, < 4.0.0)
54-
public_suffix (~> 2.0.0)
55-
rubyzip (>= 1.3.0, < 2.0.0)
97+
rubyzip (>= 2.0.0, < 3.0.0)
5698
security (= 0.1.3)
5799
simctl (~> 1.6.3)
58-
slack-notifier (>= 2.0.0, < 3.0.0)
59100
terminal-notifier (>= 2.0.0, < 3.0.0)
60101
terminal-table (>= 1.4.5, < 2.0.0)
61102
tty-screen (>= 0.6.3, < 1.0.0)
@@ -65,88 +106,106 @@ GEM
65106
xcpretty (~> 0.3.0)
66107
xcpretty-travis-formatter (>= 0.0.3)
67108
gh_inspector (1.1.3)
68-
google-api-client (0.36.4)
109+
google-apis-androidpublisher_v3 (0.41.0)
110+
google-apis-core (>= 0.11.0, < 2.a)
111+
google-apis-core (0.11.0)
69112
addressable (~> 2.5, >= 2.5.1)
70-
googleauth (~> 0.9)
71-
httpclient (>= 2.8.1, < 3.0)
113+
googleauth (>= 0.16.2, < 2.a)
114+
httpclient (>= 2.8.1, < 3.a)
72115
mini_mime (~> 1.0)
73116
representable (~> 3.0)
74-
retriable (>= 2.0, < 4.0)
75-
signet (~> 0.12)
76-
google-cloud-core (1.4.1)
117+
retriable (>= 2.0, < 4.a)
118+
rexml
119+
webrick
120+
google-apis-iamcredentials_v1 (0.17.0)
121+
google-apis-core (>= 0.11.0, < 2.a)
122+
google-apis-playcustomapp_v1 (0.13.0)
123+
google-apis-core (>= 0.11.0, < 2.a)
124+
google-apis-storage_v1 (0.19.0)
125+
google-apis-core (>= 0.9.0, < 2.a)
126+
google-cloud-core (1.6.0)
77127
google-cloud-env (~> 1.0)
78-
google-cloud-env (1.3.0)
79-
faraday (~> 0.11)
80-
google-cloud-storage (1.25.0)
81-
addressable (~> 2.5)
128+
google-cloud-errors (~> 1.0)
129+
google-cloud-env (1.6.0)
130+
faraday (>= 0.17.3, < 3.0)
131+
google-cloud-errors (1.3.1)
132+
google-cloud-storage (1.44.0)
133+
addressable (~> 2.8)
82134
digest-crc (~> 0.4)
83-
google-api-client (~> 0.33)
84-
google-cloud-core (~> 1.2)
85-
googleauth (~> 0.9)
135+
google-apis-iamcredentials_v1 (~> 0.1)
136+
google-apis-storage_v1 (~> 0.19.0)
137+
google-cloud-core (~> 1.6)
138+
googleauth (>= 0.16.2, < 2.a)
86139
mini_mime (~> 1.0)
87-
googleauth (0.10.0)
88-
faraday (~> 0.12)
140+
googleauth (1.5.2)
141+
faraday (>= 0.17.3, < 3.a)
89142
jwt (>= 1.4, < 3.0)
90143
memoist (~> 0.16)
91144
multi_json (~> 1.11)
92145
os (>= 0.9, < 2.0)
93-
signet (~> 0.12)
94-
highline (1.7.10)
95-
http-cookie (1.0.3)
146+
signet (>= 0.16, < 2.a)
147+
highline (2.0.3)
148+
http-cookie (1.0.5)
96149
domain_name (~> 0.5)
97150
httpclient (2.8.3)
98-
json (2.3.0)
99-
jwt (2.1.0)
151+
jmespath (1.6.2)
152+
json (2.6.3)
153+
jwt (2.7.0)
100154
memoist (0.16.2)
101-
mini_magick (4.10.1)
102-
mini_mime (1.0.2)
103-
multi_json (1.14.1)
104-
multi_xml (0.6.0)
155+
mini_magick (4.12.0)
156+
mini_mime (1.1.2)
157+
multi_json (1.15.0)
105158
multipart-post (2.0.0)
106-
nanaimo (0.2.6)
107-
naturally (2.2.0)
108-
os (1.0.1)
109-
plist (3.5.0)
110-
public_suffix (2.0.5)
111-
representable (3.0.4)
159+
nanaimo (0.3.0)
160+
naturally (2.2.1)
161+
optparse (0.1.1)
162+
os (1.1.4)
163+
plist (3.7.0)
164+
public_suffix (5.0.1)
165+
rake (13.0.6)
166+
representable (3.2.0)
112167
declarative (< 0.1.0)
113-
declarative-option (< 0.2.0)
168+
trailblazer-option (>= 0.1.1, < 0.2.0)
114169
uber (< 0.2.0)
115170
retriable (3.1.2)
171+
rexml (3.2.5)
116172
rouge (2.0.7)
117-
rubyzip (1.3.0)
173+
ruby2_keywords (0.0.5)
174+
rubyzip (2.3.2)
118175
security (0.1.3)
119-
signet (0.12.0)
120-
addressable (~> 2.3)
121-
faraday (~> 0.9)
176+
signet (0.17.0)
177+
addressable (~> 2.8)
178+
faraday (>= 0.17.5, < 3.a)
122179
jwt (>= 1.5, < 3.0)
123180
multi_json (~> 1.10)
124-
simctl (1.6.7)
181+
simctl (1.6.10)
125182
CFPropertyList
126183
naturally
127-
slack-notifier (2.3.2)
128184
terminal-notifier (2.0.0)
129185
terminal-table (1.8.0)
130186
unicode-display_width (~> 1.1, >= 1.1.1)
131-
tty-cursor (0.7.0)
132-
tty-screen (0.7.0)
133-
tty-spinner (0.9.2)
187+
trailblazer-option (0.1.2)
188+
tty-cursor (0.7.1)
189+
tty-screen (0.8.1)
190+
tty-spinner (0.9.3)
134191
tty-cursor (~> 0.7)
135192
uber (0.1.0)
136193
unf (0.1.4)
137194
unf_ext
138-
unf_ext (0.0.7.6)
139-
unicode-display_width (1.6.0)
195+
unf_ext (0.0.8.2)
196+
unicode-display_width (1.8.0)
197+
webrick (1.8.1)
140198
word_wrap (1.0.0)
141-
xcodeproj (1.14.0)
199+
xcodeproj (1.22.0)
142200
CFPropertyList (>= 2.3.3, < 4.0)
143201
atomos (~> 0.1.3)
144202
claide (>= 1.0.2, < 2.0)
145203
colored2 (~> 3.1)
146-
nanaimo (~> 0.2.6)
204+
nanaimo (~> 0.3.0)
205+
rexml (~> 3.2.4)
147206
xcpretty (0.3.0)
148207
rouge (~> 2.0.7)
149-
xcpretty-travis-formatter (1.0.0)
208+
xcpretty-travis-formatter (1.0.1)
150209
xcpretty (~> 0.2, >= 0.0.7)
151210

152211
PLATFORMS
@@ -156,4 +215,4 @@ DEPENDENCIES
156215
fastlane
157216

158217
BUNDLED WITH
159-
2.0.2
218+
2.4.12

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ b) You must cause any modified files to carry prominent notices stating that You
2525
c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
2626
d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
2727
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
28-
5. Submission of Contributions. Any Contribution submitted for inclusion in the Work by You to Mailchimp shall be made under the terms and conditions of the Individual Contributor License Agreement orthe Software Grant and Corporate Contributor License Agreement, as applicable.
28+
5. Submission of Contributions. Any Contribution submitted for inclusion in the Work by You to Mailchimp shall be made under the terms and conditions of the Individual Contributor License Agreement or the Software Grant and Corporate Contributor License Agreement, as applicable.
2929

3030
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of Mailchimp, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
3131

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ repositories {
3636
Next add the Mailchimp SDK to your list of dependencies. Below is a gradle example
3737

3838
```gradle
39-
implementation 'com.github.mailchimp:Mailchimp-SDK-Android:1.0.0'
39+
implementation 'com.github.mailchimp:Mailchimp-SDK-Android:1.1.0'
4040
```
4141

4242
### Initializing the SDK

build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,20 @@
1212
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1313

1414
buildscript {
15-
ext.kotlin_version = '1.3.50'
16-
ext.kotlinx_version = '1.0.2'
17-
ext.work_version = '2.0.1'
18-
ext.retrofit_version = '2.3.0'
19-
ext.nav_version = "2.1.0"
15+
ext {
16+
kotlin_version = '1.8.10'
17+
work_version = '2.8.1'
18+
retrofit_version = '2.9.0'
19+
nav_version = '2.5.3'
20+
}
21+
2022
repositories {
2123
google()
22-
jcenter()
23-
24+
mavenCentral()
2425
}
26+
2527
dependencies {
26-
classpath 'com.android.tools.build:gradle:3.5.2'
28+
classpath 'com.android.tools.build:gradle:8.0.0'
2729
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2830
// NOTE: Do not place your application dependencies here; they belong
2931
// in the individual module build.gradle files
@@ -35,8 +37,7 @@ buildscript {
3537
allprojects {
3638
repositories {
3739
google()
38-
jcenter()
39-
40+
mavenCentral()
4041
}
4142
}
4243

0 commit comments

Comments
 (0)