Skip to content

Commit cb2d7df

Browse files
HayesGordonHayesGordon
committed
Merge branch 'develop' into chore/update-samples
2 parents 8cdac9a + 31e5a98 commit cb2d7df

File tree

8 files changed

+63
-66
lines changed

8 files changed

+63
-66
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ jobs:
1717
env:
1818
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
1919
build_and_deploy_ios:
20-
runs-on: [macos-latest]
20+
runs-on: [macos-11]
2121
steps:
2222
- uses: actions/checkout@v2
23+
- run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer
2324
- name: Install RubyGems
2425
run: |
2526
cd ios
2627
bundle install
27-
- uses: subosito/flutter-action@v1.4.0
28+
- uses: subosito/flutter-action@v1.5.3
2829
with:
2930
channel: 'stable'
3031
- name: Flutter setup
@@ -51,7 +52,7 @@ jobs:
5152
- uses: actions/setup-java@v1
5253
with:
5354
java-version: '12.x'
54-
- uses: subosito/flutter-action@v1.4.0
55+
- uses: subosito/flutter-action@v1.5.3
5556
with:
5657
channel: 'stable'
5758
- run: |

‎.github/workflows/build_nightly.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ jobs:
1717
env:
1818
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
1919
build_and_deploy_ios:
20-
runs-on: [macos-latest]
20+
runs-on: [macos-11]
2121
steps:
2222
- uses: actions/checkout@v2
23+
- run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer
2324
- name: Install RubyGems
2425
run: |
2526
cd ios
2627
bundle install
27-
- uses: subosito/flutter-action@v1.4.0
28+
- uses: subosito/flutter-action@v1.5.3
2829
with:
2930
channel: 'stable'
3031
- name: Install firebase-tools
@@ -48,7 +49,7 @@ jobs:
4849
- uses: actions/setup-java@v1
4950
with:
5051
java-version: '12.x'
51-
- uses: subosito/flutter-action@v1.4.0
52+
- uses: subosito/flutter-action@v1.5.3
5253
with:
5354
channel: 'stable'
5455
- run: |
@@ -78,7 +79,7 @@ jobs:
7879
git config --global user.email "$(git log --format='%ae' HEAD^!)"
7980
git config --global user.name "$(git log --format='%an' HEAD^!)"
8081
git fetch origin gh-pages:gh-pages
81-
- uses: subosito/flutter-action@v1.4.0
82+
- uses: subosito/flutter-action@v1.5.3
8283
with:
8384
channel: 'stable'
8485
- run: flutter pub get

‎packages/stream_chat_v1/ios/Gemfile.lock‎

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.3)
4+
CFPropertyList (3.0.4)
5+
rexml
56
addressable (2.8.0)
67
public_suffix (>= 2.0.2, < 5.0)
78
artifactory (3.0.15)
89
atomos (0.1.3)
9-
aws-eventstream (1.1.1)
10-
aws-partitions (1.473.0)
11-
aws-sdk-core (3.115.0)
10+
aws-eventstream (1.2.0)
11+
aws-partitions (1.512.0)
12+
aws-sdk-core (3.121.1)
1213
aws-eventstream (~> 1, >= 1.0.2)
1314
aws-partitions (~> 1, >= 1.239.0)
1415
aws-sigv4 (~> 1.1)
1516
jmespath (~> 1.0)
16-
aws-sdk-kms (1.44.0)
17-
aws-sdk-core (~> 3, >= 3.112.0)
17+
aws-sdk-kms (1.49.0)
18+
aws-sdk-core (~> 3, >= 3.120.0)
1819
aws-sigv4 (~> 1.1)
19-
aws-sdk-s3 (1.96.1)
20-
aws-sdk-core (~> 3, >= 3.112.0)
20+
aws-sdk-s3 (1.103.0)
21+
aws-sdk-core (~> 3, >= 3.120.0)
2122
aws-sdk-kms (~> 1)
22-
aws-sigv4 (~> 1.1)
23-
aws-sigv4 (1.2.3)
23+
aws-sigv4 (~> 1.4)
24+
aws-sigv4 (1.4.0)
2425
aws-eventstream (~> 1, >= 1.0.2)
2526
babosa (1.0.4)
2627
claide (1.0.3)
@@ -29,21 +30,22 @@ GEM
2930
commander (4.6.0)
3031
highline (~> 2.0.0)
3132
declarative (0.0.20)
32-
digest-crc (0.6.3)
33+
digest-crc (0.6.4)
3334
rake (>= 12.0.0, < 14.0.0)
3435
domain_name (0.5.20190701)
3536
unf (>= 0.0.5, < 1.0.0)
3637
dotenv (2.7.6)
37-
emoji_regex (3.2.2)
38-
excon (0.83.0)
39-
faraday (1.5.0)
38+
emoji_regex (3.2.3)
39+
excon (0.86.0)
40+
faraday (1.8.0)
4041
faraday-em_http (~> 1.0)
4142
faraday-em_synchrony (~> 1.0)
4243
faraday-excon (~> 1.1)
4344
faraday-httpclient (~> 1.0.1)
4445
faraday-net_http (~> 1.0)
4546
faraday-net_http_persistent (~> 1.1)
4647
faraday-patron (~> 1.0)
48+
faraday-rack (~> 1.0)
4749
multipart-post (>= 1.2, < 3)
4850
ruby2_keywords (>= 0.0.4)
4951
faraday-cookie_jar (0.0.7)
@@ -54,14 +56,15 @@ GEM
5456
faraday-excon (1.1.0)
5557
faraday-httpclient (1.0.1)
5658
faraday-net_http (1.0.1)
57-
faraday-net_http_persistent (1.1.0)
59+
faraday-net_http_persistent (1.2.0)
5860
faraday-patron (1.0.0)
59-
faraday_middleware (1.0.0)
61+
faraday-rack (1.0.0)
62+
faraday_middleware (1.1.0)
6063
faraday (~> 1.0)
61-
fastimage (2.2.4)
62-
fastlane (2.187.0)
64+
fastimage (2.2.5)
65+
fastlane (2.195.0)
6366
CFPropertyList (>= 2.3, < 4.0.0)
64-
addressable (>= 2.3, < 3.0.0)
67+
addressable (>= 2.8, < 3.0.0)
6568
artifactory (~> 3.0)
6669
aws-sdk-s3 (~> 1.0)
6770
babosa (>= 1.0.3, < 2.0.0)
@@ -76,7 +79,7 @@ GEM
7679
faraday_middleware (~> 1.0)
7780
fastimage (>= 2.1.0, < 3.0.0)
7881
gh_inspector (>= 1.1.2, < 2.0.0)
79-
google-apis-androidpublisher_v3 (~> 0.1)
82+
google-apis-androidpublisher_v3 (~> 0.3)
8083
google-apis-playcustomapp_v1 (~> 0.1)
8184
google-cloud-storage (~> 1.31)
8285
highline (~> 2.0)
@@ -85,6 +88,7 @@ GEM
8588
mini_magick (>= 4.9.4, < 5.0.0)
8689
multipart-post (~> 2.0.0)
8790
naturally (~> 2.2)
91+
optparse (~> 0.1.1)
8892
plist (>= 3.1.0, < 4.0.0)
8993
rubyzip (>= 2.0.0, < 3.0.0)
9094
security (= 0.1.3)
@@ -99,9 +103,9 @@ GEM
99103
xcpretty-travis-formatter (>= 0.0.3)
100104
fastlane-plugin-firebase_app_distribution (0.2.9)
101105
gh_inspector (1.1.3)
102-
google-apis-androidpublisher_v3 (0.8.0)
106+
google-apis-androidpublisher_v3 (0.11.0)
103107
google-apis-core (>= 0.4, < 2.a)
104-
google-apis-core (0.4.0)
108+
google-apis-core (0.4.1)
105109
addressable (~> 2.5, >= 2.5.1)
106110
googleauth (>= 0.16.2, < 2.a)
107111
httpclient (>= 2.8.1, < 3.a)
@@ -110,63 +114,64 @@ GEM
110114
retriable (>= 2.0, < 4.a)
111115
rexml
112116
webrick
113-
google-apis-iamcredentials_v1 (0.6.0)
117+
google-apis-iamcredentials_v1 (0.7.0)
114118
google-apis-core (>= 0.4, < 2.a)
115119
google-apis-playcustomapp_v1 (0.5.0)
116120
google-apis-core (>= 0.4, < 2.a)
117-
google-apis-storage_v1 (0.6.0)
121+
google-apis-storage_v1 (0.8.0)
118122
google-apis-core (>= 0.4, < 2.a)
119123
google-cloud-core (1.6.0)
120124
google-cloud-env (~> 1.0)
121125
google-cloud-errors (~> 1.0)
122126
google-cloud-env (1.5.0)
123127
faraday (>= 0.17.3, < 2.0)
124-
google-cloud-errors (1.1.0)
125-
google-cloud-storage (1.34.0)
128+
google-cloud-errors (1.2.0)
129+
google-cloud-storage (1.34.1)
126130
addressable (~> 2.5)
127131
digest-crc (~> 0.4)
128132
google-apis-iamcredentials_v1 (~> 0.1)
129133
google-apis-storage_v1 (~> 0.1)
130134
google-cloud-core (~> 1.6)
131135
googleauth (>= 0.16.2, < 2.a)
132136
mini_mime (~> 1.0)
133-
googleauth (0.16.2)
137+
googleauth (1.0.0)
134138
faraday (>= 0.17.3, < 2.0)
135139
jwt (>= 1.4, < 3.0)
136140
memoist (~> 0.16)
137141
multi_json (~> 1.11)
138142
os (>= 0.9, < 2.0)
139-
signet (~> 0.14)
143+
signet (>= 0.16, < 2.a)
140144
highline (2.0.3)
141145
http-cookie (1.0.4)
142146
domain_name (~> 0.5)
143147
httpclient (2.8.3)
144148
jmespath (1.4.0)
145149
json (2.5.1)
146-
jwt (2.2.3)
150+
jwt (2.3.0)
147151
memoist (0.16.2)
148152
mini_magick (4.11.0)
149-
mini_mime (1.1.0)
153+
mini_mime (1.1.1)
150154
multi_json (1.15.0)
151155
multipart-post (2.0.0)
152156
nanaimo (0.3.0)
153157
naturally (2.2.1)
158+
optparse (0.1.1)
154159
os (1.1.1)
155160
plist (3.6.0)
156161
public_suffix (4.0.6)
157-
rake (13.0.4)
162+
rake (13.0.6)
158163
representable (3.1.1)
159164
declarative (< 0.1.0)
160165
trailblazer-option (>= 0.1.1, < 0.2.0)
161166
uber (< 0.2.0)
162167
retriable (3.1.2)
163168
rexml (3.2.5)
164169
rouge (2.0.7)
165-
ruby2_keywords (0.0.4)
170+
ruby2_keywords (0.0.5)
166171
rubyzip (2.3.2)
167172
security (0.1.3)
168-
signet (0.15.0)
169-
addressable (~> 2.3)
173+
signet (0.16.0)
174+
addressable (~> 2.8)
170175
faraday (>= 0.17.3, < 2.0)
171176
jwt (>= 1.5, < 3.0)
172177
multi_json (~> 1.10)
@@ -184,11 +189,11 @@ GEM
184189
uber (0.1.0)
185190
unf (0.1.4)
186191
unf_ext
187-
unf_ext (0.0.7.7)
188-
unicode-display_width (1.7.0)
192+
unf_ext (0.0.8)
193+
unicode-display_width (1.8.0)
189194
webrick (1.7.0)
190195
word_wrap (1.0.0)
191-
xcodeproj (1.20.0)
196+
xcodeproj (1.21.0)
192197
CFPropertyList (>= 2.3.3, < 4.0)
193198
atomos (~> 0.1.3)
194199
claide (>= 1.0.2, < 2.0)

‎packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@
449449
);
450450
PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter;
451451
PRODUCT_NAME = "$(TARGET_NAME)";
452-
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter 1620032657";
452+
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter 1633610671";
453453
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
454454
SWIFT_VERSION = 5.0;
455455
VERSIONING_SYSTEM = "apple-generic";
@@ -588,7 +588,7 @@
588588
);
589589
PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter;
590590
PRODUCT_NAME = "$(TARGET_NAME)";
591-
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter 1620032657";
591+
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter 1633610671";
592592
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
593593
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
594594
SWIFT_VERSION = 5.0;
@@ -622,7 +622,7 @@
622622
);
623623
PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter;
624624
PRODUCT_NAME = "$(TARGET_NAME)";
625-
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter 1620032657";
625+
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter 1633610671";
626626
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
627627
SWIFT_VERSION = 5.0;
628628
VERSIONING_SYSTEM = "apple-generic";

‎packages/stream_chat_v1/ios/fastlane/Fastfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
fastlane_version "2.187.0"
1+
fastlane_version "2.195.0"
22
default_platform :ios
33

44
before_all do
@@ -34,7 +34,7 @@ platform :ios do
3434
desc "Deploy build to Firebase"
3535
lane :deploy_to_firebase do
3636
match_me
37-
37+
3838
gym(
3939
workspace: "./Runner.xcworkspace",
4040
scheme: "Runner",

‎packages/stream_chat_v1/ios/fastlane/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ Deploy build to TestFlight
4242

4343
----
4444

45-
This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
45+
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
4646
More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
4747
The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

‎packages/stream_chat_v1/ios/fastlane/beta_gym_export_options.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>provisioningProfiles</key>
88
<dict>
99
<key>io.getstream.flutter</key>
10-
<string>match AdHoc io.getstream.flutter 1620032657</string>
10+
<string>match AdHoc io.getstream.flutter 1633610671</string>
1111
</dict>
1212
</dict>
1313
</plist>

‎packages/stream_chat_v1/ios/fastlane/report.xml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,27 @@
55

66

77

8-
<testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.000512">
8+
<testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.000502">
99

1010
</testcase>
1111

1212

13-
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.00019">
13+
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000219">
1414

1515
</testcase>
1616

1717

18-
<testcase classname="fastlane.lanes" name="2: is_ci" time="0.000194">
18+
<testcase classname="fastlane.lanes" name="2: is_ci" time="0.000236">
1919

2020
</testcase>
2121

2222

23-
<testcase classname="fastlane.lanes" name="3: Switch to ios match_me lane" time="0.000207">
23+
<testcase classname="fastlane.lanes" name="3: is_ci" time="0.000185">
2424

2525
</testcase>
2626

2727

28-
<testcase classname="fastlane.lanes" name="4: is_ci" time="0.000177">
29-
30-
</testcase>
31-
32-
33-
<testcase classname="fastlane.lanes" name="5: match" time="8.690712">
34-
35-
</testcase>
36-
37-
38-
<testcase classname="fastlane.lanes" name="6: gym" time="23.786307">
28+
<testcase classname="fastlane.lanes" name="4: match" time="37.729199">
3929

4030
</testcase>
4131

0 commit comments

Comments
 (0)