Skip to content

Commit 2f3fa25

Browse files
testableappletestableapple
authored
Get rid of the dependency between TestTools and TestHelpers (#401)
1 parent ddb7d2b commit 2f3fa25

File tree

2 files changed

+56
-66
lines changed

2 files changed

+56
-66
lines changed

‎Gemfile.lock‎

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@ GEM
33
specs:
44
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (7.0.8)
6+
activesupport (7.1.2)
7+
base64
8+
bigdecimal
79
concurrent-ruby (~> 1.0, >= 1.0.2)
10+
connection_pool (>= 2.2.5)
11+
drb
812
i18n (>= 1.6, < 2)
913
minitest (>= 5.1)
14+
mutex_m
1015
tzinfo (~> 2.0)
1116
addressable (2.8.5)
1217
public_suffix (>= 2.0.2, < 6.0)
@@ -16,35 +21,37 @@ GEM
1621
artifactory (3.0.15)
1722
ast (2.4.2)
1823
atomos (0.1.3)
19-
aws-eventstream (1.2.0)
20-
aws-partitions (1.829.0)
21-
aws-sdk-core (3.184.0)
22-
aws-eventstream (~> 1, >= 1.0.2)
24+
aws-eventstream (1.3.0)
25+
aws-partitions (1.862.0)
26+
aws-sdk-core (3.190.0)
27+
aws-eventstream (~> 1, >= 1.3.0)
2328
aws-partitions (~> 1, >= 1.651.0)
24-
aws-sigv4 (~> 1.5)
29+
aws-sigv4 (~> 1.8)
2530
jmespath (~> 1, >= 1.6.1)
26-
aws-sdk-kms (1.72.0)
27-
aws-sdk-core (~> 3, >= 3.184.0)
31+
aws-sdk-kms (1.74.0)
32+
aws-sdk-core (~> 3, >= 3.188.0)
2833
aws-sigv4 (~> 1.1)
29-
aws-sdk-s3 (1.136.0)
30-
aws-sdk-core (~> 3, >= 3.181.0)
34+
aws-sdk-s3 (1.141.0)
35+
aws-sdk-core (~> 3, >= 3.189.0)
3136
aws-sdk-kms (~> 1)
32-
aws-sigv4 (~> 1.6)
33-
aws-sigv4 (1.6.0)
37+
aws-sigv4 (~> 1.8)
38+
aws-sigv4 (1.8.0)
3439
aws-eventstream (~> 1, >= 1.0.2)
3540
babosa (1.0.4)
41+
base64 (0.2.0)
42+
bigdecimal (3.1.4)
3643
claide (1.1.0)
3744
claide-plugins (0.9.2)
3845
cork
3946
nap
4047
open4 (~> 1.3)
4148
clamp (1.3.2)
42-
cocoapods (1.13.0)
49+
cocoapods (1.14.3)
4350
addressable (~> 2.8)
4451
claide (>= 1.0.2, < 2.0)
45-
cocoapods-core (= 1.13.0)
52+
cocoapods-core (= 1.14.3)
4653
cocoapods-deintegrate (>= 1.0.3, < 2.0)
47-
cocoapods-downloader (>= 1.6.0, < 2.0)
54+
cocoapods-downloader (>= 2.1, < 3.0)
4855
cocoapods-plugins (>= 1.0.0, < 2.0)
4956
cocoapods-search (>= 1.0.0, < 2.0)
5057
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -57,7 +64,7 @@ GEM
5764
nap (~> 1.0)
5865
ruby-macho (>= 2.3.0, < 3.0)
5966
xcodeproj (>= 1.23.0, < 2.0)
60-
cocoapods-core (1.13.0)
67+
cocoapods-core (1.14.3)
6168
activesupport (>= 5.0, < 8)
6269
addressable (~> 2.8)
6370
algoliasearch (~> 1.0)
@@ -68,7 +75,7 @@ GEM
6875
public_suffix (~> 4.0)
6976
typhoeus (~> 1.0)
7077
cocoapods-deintegrate (1.0.5)
71-
cocoapods-downloader (1.6.3)
78+
cocoapods-downloader (2.1)
7279
cocoapods-plugins (1.0.0)
7380
nap
7481
cocoapods-search (1.0.1)
@@ -82,9 +89,10 @@ GEM
8289
commander (4.6.0)
8390
highline (~> 2.0.0)
8491
concurrent-ruby (1.2.2)
92+
connection_pool (2.4.1)
8593
cork (0.3.0)
8694
colored2 (~> 3.1)
87-
danger (9.3.2)
95+
danger (9.4.1)
8896
claide (~> 1.0)
8997
claide-plugins (>= 0.9.2)
9098
colored2 (~> 3.1)
@@ -95,7 +103,7 @@ GEM
95103
kramdown (~> 2.3)
96104
kramdown-parser-gfm (~> 1.0)
97105
no_proxy_fix
98-
octokit (~> 6.0)
106+
octokit (>= 6.0)
99107
terminal-table (>= 1, < 4)
100108
danger-commit_lint (0.0.7)
101109
danger-plugin-api (~> 1.0)
@@ -104,14 +112,15 @@ GEM
104112
declarative (0.0.20)
105113
digest-crc (0.6.5)
106114
rake (>= 12.0.0, < 14.0.0)
107-
domain_name (0.5.20190701)
108-
unf (>= 0.0.5, < 1.0.0)
115+
domain_name (0.6.20231109)
109116
dotenv (2.8.1)
117+
drb (2.2.0)
118+
ruby2_keywords
110119
emoji_regex (3.2.3)
111120
escape (0.0.4)
112121
ethon (0.16.0)
113122
ffi (>= 1.15.0)
114-
excon (0.103.0)
123+
excon (0.105.0)
115124
faraday (1.10.3)
116125
faraday-em_http (~> 1.0)
117126
faraday-em_synchrony (~> 1.0)
@@ -143,7 +152,7 @@ GEM
143152
faraday_middleware (1.2.0)
144153
faraday (~> 1.0)
145154
fastimage (2.2.7)
146-
fastlane (2.216.0)
155+
fastlane (2.217.0)
147156
CFPropertyList (>= 2.3, < 4.0.0)
148157
addressable (>= 2.8, < 3.0.0)
149158
artifactory (~> 3.0)
@@ -184,7 +193,7 @@ GEM
184193
xcpretty (~> 0.3.0)
185194
xcpretty-travis-formatter (>= 0.0.3)
186195
fastlane-plugin-create_xcframework (1.1.2)
187-
fastlane-plugin-emerge (0.6.0)
196+
fastlane-plugin-emerge (0.6.2)
188197
faraday (~> 1.1)
189198
fastlane-plugin-lizard (1.3.3)
190199
bundler
@@ -194,16 +203,16 @@ GEM
194203
fastlane-plugin-stream_actions (0.3.20)
195204
xctest_list (= 1.2.1)
196205
fastlane-plugin-versioning (0.5.2)
197-
ffi (1.16.2)
206+
ffi (1.16.3)
198207
fourflusher (2.3.1)
199208
fuzzy_match (2.0.4)
200209
gh_inspector (1.1.3)
201210
git (1.18.0)
202211
addressable (~> 2.8)
203212
rchardet (~> 1.8)
204-
google-apis-androidpublisher_v3 (0.50.0)
213+
google-apis-androidpublisher_v3 (0.53.0)
205214
google-apis-core (>= 0.11.0, < 2.a)
206-
google-apis-core (0.11.1)
215+
google-apis-core (0.11.2)
207216
addressable (~> 2.5, >= 2.5.1)
208217
googleauth (>= 0.16.2, < 2.a)
209218
httpclient (>= 2.8.1, < 3.a)
@@ -216,19 +225,19 @@ GEM
216225
google-apis-core (>= 0.11.0, < 2.a)
217226
google-apis-playcustomapp_v1 (0.13.0)
218227
google-apis-core (>= 0.11.0, < 2.a)
219-
google-apis-storage_v1 (0.19.0)
220-
google-apis-core (>= 0.9.0, < 2.a)
228+
google-apis-storage_v1 (0.29.0)
229+
google-apis-core (>= 0.11.0, < 2.a)
221230
google-cloud-core (1.6.0)
222231
google-cloud-env (~> 1.0)
223232
google-cloud-errors (~> 1.0)
224233
google-cloud-env (1.6.0)
225234
faraday (>= 0.17.3, < 3.0)
226235
google-cloud-errors (1.3.1)
227-
google-cloud-storage (1.44.0)
236+
google-cloud-storage (1.45.0)
228237
addressable (~> 2.8)
229238
digest-crc (~> 0.4)
230239
google-apis-iamcredentials_v1 (~> 0.1)
231-
google-apis-storage_v1 (~> 0.19.0)
240+
google-apis-storage_v1 (~> 0.29.0)
232241
google-cloud-core (~> 1.6)
233242
googleauth (>= 0.16.2, < 2.a)
234243
mini_mime (~> 1.0)
@@ -255,7 +264,7 @@ GEM
255264
sqlite3 (~> 1.3)
256265
xcinvoke (~> 0.3.0)
257266
jmespath (1.6.2)
258-
json (2.6.3)
267+
json (2.7.0)
259268
jwt (2.7.1)
260269
kramdown (2.4.0)
261270
rexml
@@ -265,46 +274,47 @@ GEM
265274
method_source (1.0.0)
266275
mini_magick (4.12.0)
267276
mini_mime (1.1.5)
268-
mini_portile2 (2.8.4)
277+
mini_portile2 (2.8.5)
269278
minitest (5.20.0)
270279
molinillo (0.8.0)
271280
multi_json (1.15.0)
272281
multipart-post (2.3.0)
273282
mustache (1.1.1)
274283
mustermann (3.0.0)
275284
ruby2_keywords (~> 0.0.1)
285+
mutex_m (0.2.0)
276286
nanaimo (0.3.0)
277287
nap (1.1.0)
278288
naturally (2.2.1)
279289
netrc (0.11.0)
280290
no_proxy_fix (0.1.2)
281-
nokogiri (1.15.4)
291+
nokogiri (1.15.5)
282292
mini_portile2 (~> 2.8.2)
283293
racc (~> 1.4)
284-
octokit (6.1.1)
294+
octokit (8.0.0)
285295
faraday (>= 1, < 3)
286296
sawyer (~> 0.9)
287297
open4 (1.3.4)
288298
optparse (0.1.1)
289299
os (1.1.4)
290300
parallel (1.23.0)
291-
parser (3.2.2.3)
301+
parser (3.2.2.4)
292302
ast (~> 2.4.1)
293303
racc
294304
plist (3.7.0)
295305
pry (0.14.2)
296306
coderay (~> 1.1)
297307
method_source (~> 1.0)
298308
public_suffix (4.0.7)
299-
racc (1.7.1)
309+
racc (1.7.3)
300310
rack (2.2.8)
301311
rack-protection (3.1.0)
302312
rack (~> 2.2, >= 2.2.4)
303313
rainbow (3.1.1)
304-
rake (13.0.6)
314+
rake (13.1.0)
305315
rchardet (1.8.0)
306316
redcarpet (3.6.0)
307-
regexp_parser (2.8.1)
317+
regexp_parser (2.8.2)
308318
representable (3.2.0)
309319
declarative (< 0.1.0)
310320
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -322,7 +332,7 @@ GEM
322332
rubocop-ast (>= 1.23.0, < 2.0)
323333
ruby-progressbar (~> 1.7)
324334
unicode-display_width (>= 1.4.0, < 3.0)
325-
rubocop-ast (1.29.0)
335+
rubocop-ast (1.30.0)
326336
parser (>= 3.2.1.0)
327337
rubocop-performance (1.19.1)
328338
rubocop (>= 1.7.0, < 2.0)
@@ -352,13 +362,13 @@ GEM
352362
rack (~> 2.2, >= 2.2.4)
353363
rack-protection (= 3.1.0)
354364
tilt (~> 2.0)
355-
slather (2.7.4)
365+
slather (2.8.0)
356366
CFPropertyList (>= 2.2, < 4)
357367
activesupport
358368
clamp (~> 1.3)
359-
nokogiri (>= 1.13.9)
369+
nokogiri (>= 1.14.3)
360370
xcodeproj (~> 1.21)
361-
sqlite3 (1.6.6)
371+
sqlite3 (1.6.9)
362372
mini_portile2 (~> 2.8.0)
363373
terminal-notifier (2.0.0)
364374
terminal-table (3.0.2)
@@ -369,15 +379,12 @@ GEM
369379
tty-screen (0.8.1)
370380
tty-spinner (0.9.3)
371381
tty-cursor (~> 0.7)
372-
typhoeus (1.4.0)
382+
typhoeus (1.4.1)
373383
ethon (>= 0.9.0)
374384
tzinfo (2.0.6)
375385
concurrent-ruby (~> 1.0)
376386
uber (0.1.0)
377-
unf (0.1.4)
378-
unf_ext
379-
unf_ext (0.0.8.2)
380-
unicode-display_width (2.4.2)
387+
unicode-display_width (2.5.0)
381388
webrick (1.8.1)
382389
word_wrap (1.0.0)
383390
xcinvoke (0.3.0)

‎StreamChatSwiftUI.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@
439439
91B79FD9284E7E9C005B6E4F /* ChatUserNamer_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91B79FD8284E7E9C005B6E4F /* ChatUserNamer_Tests.swift */; };
440440
91CC203A283C3E7F0049A146 /* URLExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91CC2039283C3E7F0049A146 /* URLExtensions.swift */; };
441441
91CC203C283C4C250049A146 /* URLUtils_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91CC203B283C4C250049A146 /* URLUtils_Tests.swift */; };
442-
A3571603283E9D9F0014E3B0 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = A3571602283E9D9F0014E3B0 /* Swifter */; };
443442
A35D803B283E89F50084FE25 /* StreamChatSwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8465FBB52746873A00AF091E /* StreamChatSwiftUI.framework */; };
444443
A35D803C283E89F50084FE25 /* StreamChatSwiftUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8465FBB52746873A00AF091E /* StreamChatSwiftUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
445444
A3600B2A283E9E1900E1C930 /* UserRobot.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3600B24283E9E1900E1C930 /* UserRobot.swift */; };
@@ -970,7 +969,6 @@
970969
isa = PBXFrameworksBuildPhase;
971970
buildActionMask = 2147483647;
972971
files = (
973-
A3571603283E9D9F0014E3B0 /* Swifter in Frameworks */,
974972
846AD4D2284F89B10074A0DD /* StreamChatTestTools in Frameworks */,
975973
8205B4182AD4267200265B84 /* StreamSwiftTestHelpers in Frameworks */,
976974
846AD4D0284F89B10074A0DD /* StreamChatTestMockServer in Frameworks */,
@@ -2026,7 +2024,6 @@
20262024
);
20272025
name = StreamChatSwiftUITestsAppTests;
20282026
packageProductDependencies = (
2029-
A3571602283E9D9F0014E3B0 /* Swifter */,
20302027
846AD4CF284F89B10074A0DD /* StreamChatTestMockServer */,
20312028
846AD4D1284F89B10074A0DD /* StreamChatTestTools */,
20322029
8205B4172AD4267200265B84 /* StreamSwiftTestHelpers */,
@@ -2167,7 +2164,6 @@
21672164
packageReferences = (
21682165
E3A1C01A282BAC66002D1E26 /* XCRemoteSwiftPackageReference "sentry-cocoa" */,
21692166
8400A346282C06F90067D3A0 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */,
2170-
A3571601283E9D9F0014E3B0 /* XCRemoteSwiftPackageReference "swifter" */,
21712167
84E95A75284A486600699FD3 /* XCRemoteSwiftPackageReference "stream-chat-swift" */,
21722168
82543C7B2AD41B0400D5F6CD /* XCRemoteSwiftPackageReference "stream-chat-swift-test-helpers" */,
21732169
);
@@ -3242,7 +3238,7 @@
32423238
repositoryURL = "https://github.com/GetStream/stream-chat-swift-test-helpers.git";
32433239
requirement = {
32443240
kind = exactVersion;
3245-
version = 0.3.3;
3241+
version = 0.4.1;
32463242
};
32473243
};
32483244
8400A346282C06F90067D3A0 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */ = {
@@ -3269,14 +3265,6 @@
32693265
minimumVersion = 4.44.0;
32703266
};
32713267
};
3272-
A3571601283E9D9F0014E3B0 /* XCRemoteSwiftPackageReference "swifter" */ = {
3273-
isa = XCRemoteSwiftPackageReference;
3274-
repositoryURL = "https://github.com/httpswift/swifter.git";
3275-
requirement = {
3276-
kind = exactVersion;
3277-
version = 1.5.0;
3278-
};
3279-
};
32803268
E3A1C01A282BAC66002D1E26 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
32813269
isa = XCRemoteSwiftPackageReference;
32823270
repositoryURL = "https://github.com/getsentry/sentry-cocoa.git";
@@ -3333,11 +3321,6 @@
33333321
package = 84E95A75284A486600699FD3 /* XCRemoteSwiftPackageReference "stream-chat-swift" */;
33343322
productName = StreamChatTestTools;
33353323
};
3336-
A3571602283E9D9F0014E3B0 /* Swifter */ = {
3337-
isa = XCSwiftPackageProductDependency;
3338-
package = A3571601283E9D9F0014E3B0 /* XCRemoteSwiftPackageReference "swifter" */;
3339-
productName = Swifter;
3340-
};
33413324
E3A1C01B282BAC66002D1E26 /* Sentry */ = {
33423325
isa = XCSwiftPackageProductDependency;
33433326
package = E3A1C01A282BAC66002D1E26 /* XCRemoteSwiftPackageReference "sentry-cocoa" */;

0 commit comments

Comments
 (0)